Merge "Update wording for RC and Watchlist UI opt-out option"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Nov 2018 16:41:46 +0000 (16:41 +0000)
1  2 
includes/preferences/DefaultPreferencesFactory.php
languages/i18n/en.json

@@@ -961,7 -961,7 +961,7 @@@ class DefaultPreferencesFactory impleme
                $defaultPreferences['hideminor'] = [
                        'type' => 'toggle',
                        'label-message' => 'tog-hideminor',
 -                      'section' => 'rc/advancedrc',
 +                      'section' => 'rc/changesrc',
                ];
                $defaultPreferences['rcfilters-rc-collapsed'] = [
                        'type' => 'api',
                        $defaultPreferences['hidecategorization'] = [
                                'type' => 'toggle',
                                'label-message' => 'tog-hidecategorization',
 -                              'section' => 'rc/advancedrc',
 +                              'section' => 'rc/changesrc',
                        ];
                }
  
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['hidepatrolled'] = [
                                'type' => 'toggle',
 -                              'section' => 'rc/advancedrc',
 +                              'section' => 'rc/changesrc',
                                'label-message' => 'tog-hidepatrolled',
                        ];
                }
                if ( $user->useNPPatrol() ) {
                        $defaultPreferences['newpageshidepatrolled'] = [
                                'type' => 'toggle',
 -                              'section' => 'rc/advancedrc',
 +                              'section' => 'rc/changesrc',
                                'label-message' => 'tog-newpageshidepatrolled',
                        ];
                }
  
                $defaultPreferences['rcenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'rc/optoutrc',
+                       'section' => 'rc/advancedrc',
                        'label-message' => 'rcfilters-preference-label',
                        'help-message' => 'rcfilters-preference-help',
                ];
                ];
                $defaultPreferences['watchlisthideminor'] = [
                        'type' => 'toggle',
 -                      'section' => 'watchlist/advancedwatchlist',
 +                      'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideminor',
                ];
                $defaultPreferences['watchlisthidebots'] = [
                        'type' => 'toggle',
 -                      'section' => 'watchlist/advancedwatchlist',
 +                      'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthidebots',
                ];
                $defaultPreferences['watchlisthideown'] = [
                        'type' => 'toggle',
 -                      'section' => 'watchlist/advancedwatchlist',
 +                      'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideown',
                ];
                $defaultPreferences['watchlisthideanons'] = [
                        'type' => 'toggle',
 -                      'section' => 'watchlist/advancedwatchlist',
 +                      'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideanons',
                ];
                $defaultPreferences['watchlisthideliu'] = [
                        'type' => 'toggle',
 -                      'section' => 'watchlist/advancedwatchlist',
 +                      'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideliu',
                ];
  
                if ( $this->config->get( 'RCWatchCategoryMembership' ) ) {
                        $defaultPreferences['watchlisthidecategorization'] = [
                                'type' => 'toggle',
 -                              'section' => 'watchlist/advancedwatchlist',
 +                              'section' => 'watchlist/changeswatchlist',
                                'label-message' => 'tog-watchlisthidecategorization',
                        ];
                }
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['watchlisthidepatrolled'] = [
                                'type' => 'toggle',
 -                              'section' => 'watchlist/advancedwatchlist',
 +                              'section' => 'watchlist/changeswatchlist',
                                'label-message' => 'tog-watchlisthidepatrolled',
                        ];
                }
                                // tog-watchrollback
                                $defaultPreferences[$pref] = [
                                        'type' => 'toggle',
 -                                      'section' => 'watchlist/advancedwatchlist',
 +                                      'section' => 'watchlist/pageswatchlist',
                                        'label-message' => "tog-$pref",
                                ];
                        }
  
                $defaultPreferences['wlenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/optoutwatchlist',
+                       'section' => 'watchlist/advancedwatchlist',
                        'label-message' => 'rcfilters-watchlist-preference-label',
                        'help-message' => 'rcfilters-watchlist-preference-help',
                ];
diff --combined languages/i18n/en.json
        "prefs-advancedwatchlist": "Advanced options",
        "prefs-displayrc": "Display options",
        "prefs-displaywatchlist": "Display options",
 +      "prefs-changesrc": "Changes shown",
 +      "prefs-changeswatchlist": "Changes shown",
 +      "prefs-pageswatchlist": "Watched pages",
        "prefs-tokenwatchlist": "Token",
        "prefs-diffs": "Diffs",
        "prefs-help-prefershttps": "This preference will take effect on your next login.",
        "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",
        "contribsub2": "For {{GENDER:$3|$1}} ($2)",
        "contributions-userdoesnotexist": "User account \"$1\" is not registered.",
        "nocontribs": "No changes were found matching these criteria.",
 -      "uctop": "(current)",
 +      "uctop": "current",
        "month": "From month (and earlier):",
        "year": "From year (and earlier):",
        "date": "From date (and earlier):",
        "move-watch": "Watch source page and target page",
        "movepagebtn": "Move page",
        "pagemovedsub": "Move succeeded",
 +      "cannotmove": "The page could not be moved, for the following {{PLURAL:$1|reason|reasons}}:",
        "movepage-moved": "<strong>\"$1\" has been moved to \"$2\"</strong>",
        "movepage-moved-redirect": "A redirect has been created.",
        "movepage-moved-noredirect": "The creation of a redirect has been suppressed.",
        "allmessages-filter-modified": "Modified",
        "allmessages-prefix": "Filter by prefix:",
        "allmessages-language": "Language:",
 -      "allmessages-filter-submit": "Go",
 +      "allmessages-filter-submit": "Filter",
        "allmessages-filter-translate": "Translate",
        "thumbnail-more": "Enlarge",
        "filemissing": "File missing",
        "tags-summary": "",
        "tag-filter": "[[Special:Tags|Tag]] filter:",
        "tag-filter-submit": "Filter",
 -      "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag|Tags}}]]: $2)",
 +      "tag-list-wrapper": "[[Special:Tags|{{PLURAL:$1|Tag|Tags}}]]: $2",
        "tag-mw-contentmodelchange": "content model change",
        "tag-mw-contentmodelchange-description": "Edits that [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel change the content model] of a page",
        "tag-mw-new-redirect": "New redirect",
        "dberr-again": "Try waiting a few minutes and reloading.",
        "dberr-info": "(Cannot access the database: $1)",
        "dberr-info-hidden": "(Cannot access the database)",
 -      "dberr-usegoogle": "You can try searching via Google in the meantime.",
 -      "dberr-outofdate": "Note that their indexes of our content may be out of date.",
 -      "dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.",
        "htmlform-invalid-input": "There are problems with some of your input.",
        "htmlform-select-badoption": "The value you specified is not a valid option.",
        "htmlform-int-invalid": "The value you specified is not an integer.",
        "logentry-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-partialblock-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from editing {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6",
        "logentry-partialblock-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} preventing edits on {{PLURAL:$8||the pages}} $7 with an expiration time of $5 $6",
 -      "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from non-editing actions with an expiration time of $5 $6",
 -      "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for non-editing actions with an expiration time of $5 $6",
 +      "logentry-non-editing-block-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} from specified non-editing actions with an expiration time of $5 $6",
 +      "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} for specified non-editing actions with an expiration time of $5 $6",
        "logentry-suppress-block": "$1 {{GENDER:$2|blocked}} {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} block settings for {{GENDER:$4|$3}} with an expiration time of $5 $6",
        "logentry-import-upload": "$1 {{GENDER:$2|imported}} $3 by file upload",