Merge "Update wording for RC and Watchlist UI opt-out option"

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index 0417ff5..32a5404 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -1020,7 +1020,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 
                $defaultPreferences['rcenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'rc/optoutrc',
+                       'section' => 'rc/advancedrc',
                        'label-message' => 'rcfilters-preference-label',
                        'help-message' => 'rcfilters-preference-help',
                ];
@@ -1201,7 +1201,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 
                $defaultPreferences['wlenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/optoutwatchlist',
+                       'section' => 'watchlist/advancedwatchlist',
                        'label-message' => 'rcfilters-watchlist-preference-label',
                        'help-message' => 'rcfilters-watchlist-preference-help',
                ];

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 7e22fc1..9ff77dc 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1527,10 +1527,10 @@
        "rcfilters-watchlist-markseen-button": "Mark all changes as seen",
        "rcfilters-watchlist-edit-watchlist-button": "Edit your list of watched pages",
        "rcfilters-watchlist-showupdated": "Changes to pages you haven't visited since the changes occurred are in <strong>bold</strong>, with solid markers.",
-       "rcfilters-preference-label": "Hide the improved version of Recent Changes",
-       "rcfilters-preference-help": "Rolls back the 2017 interface redesign and all tools added then and since.",
-       "rcfilters-watchlist-preference-label": "Hide the improved version of the Watchlist",
-       "rcfilters-watchlist-preference-help": "Rolls back the 2017 interface redesign and all tools added then and since.",
+       "rcfilters-preference-label": "Use non-JavaScript interface",
+       "rcfilters-preference-help": "Loads RecentChanges without filters or highlighting functionality.",
+       "rcfilters-watchlist-preference-label": "Use non-JavaScript interface",
+       "rcfilters-watchlist-preference-help": "Loads Watchlist without filters or highlighting functionality.",
        "rcfilters-filter-showlinkedfrom-label": "Show changes on pages linked from",
        "rcfilters-filter-showlinkedfrom-option-label": "<strong>Pages linked from</strong> the selected page",
        "rcfilters-filter-showlinkedto-label": "Show changes on pages linking to",