Merge "Add editing own JSON to editmyoptions grant"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2f1efbf..36b4d1e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5820,6 +5820,7 @@ $wgGrantPermissions['editmycssjs']['editmyuserjson'] = true;
 $wgGrantPermissions['editmycssjs']['editmyuserjs'] = true;
 
 $wgGrantPermissions['editmyoptions']['editmyoptions'] = true;
+$wgGrantPermissions['editmyoptions']['editmyuserjson'] = true;
 
 $wgGrantPermissions['editinterface'] = $wgGrantPermissions['editpage'];
 $wgGrantPermissions['editinterface']['editinterface'] = true;

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 7a1cd1a..62d7d7b 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1306,7 +1306,7 @@
        "grant-delete": "Delete pages, revisions, and log entries",
        "grant-editinterface": "Edit the MediaWiki namespace and sitewide/user JSON",
        "grant-editmycssjs": "Edit your user CSS/JSON/JavaScript",
-       "grant-editmyoptions": "Edit your user preferences",
+       "grant-editmyoptions": "Edit your user preferences and JSON configuration",
        "grant-editmywatchlist": "Edit your watchlist",
        "grant-editsiteconfig": "Edit sitewide and user CSS/JS",
        "grant-editpage": "Edit existing pages",