From f526b303057b71849015469be3354f8c6ea67c91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 25 Sep 2018 07:35:55 +0200 Subject: [PATCH] Special:Preferences: Split up "Advanced options" on watchlist and RC tabs On Special:Preferences, in the "Watchlist" and "Recent changes" tabs, there is currently an "Advanced options" section, which contains a huge list of mostly unrelated checkboxes. Split off some of them that are actually related to two new sections, "Watched pages" and "Changes shown", to make it easier to understand their purpose. Change-Id: I9bf91b78f6af49214a5d467d0896c63eb376d3d2 --- .../preferences/DefaultPreferencesFactory.php | 24 +++++++++---------- languages/i18n/en.json | 3 +++ languages/i18n/qqq.json | 3 +++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index c552506fe3..0417ff538a 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -961,7 +961,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $defaultPreferences['hideminor'] = [ 'type' => 'toggle', 'label-message' => 'tog-hideminor', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', ]; $defaultPreferences['rcfilters-rc-collapsed'] = [ 'type' => 'api', @@ -990,14 +990,14 @@ class DefaultPreferencesFactory implements PreferencesFactory { $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', ]; } @@ -1005,7 +1005,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $user->useNPPatrol() ) { $defaultPreferences['newpageshidepatrolled'] = [ 'type' => 'toggle', - 'section' => 'rc/advancedrc', + 'section' => 'rc/changesrc', 'label-message' => 'tog-newpageshidepatrolled', ]; } @@ -1091,27 +1091,27 @@ class DefaultPreferencesFactory implements PreferencesFactory { ]; $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', ]; @@ -1135,7 +1135,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $this->config->get( 'RCWatchCategoryMembership' ) ) { $defaultPreferences['watchlisthidecategorization'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthidecategorization', ]; } @@ -1143,7 +1143,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { if ( $user->useRCPatrol() ) { $defaultPreferences['watchlisthidepatrolled'] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/changeswatchlist', 'label-message' => 'tog-watchlisthidepatrolled', ]; } @@ -1174,7 +1174,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { // tog-watchrollback $defaultPreferences[$pref] = [ 'type' => 'toggle', - 'section' => 'watchlist/advancedwatchlist', + 'section' => 'watchlist/pageswatchlist', 'label-message' => "tog-$pref", ]; } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index ba6353f795..e5de105b5b 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1144,6 +1144,9 @@ "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.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 1d058893ff..d83152b1fe 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1347,6 +1347,9 @@ "prefs-advancedwatchlist": "Used in [[Special:Preferences]], tab \"Watchlist\".\n{{Identical|Advanced options}}", "prefs-displayrc": "\"Display\" is a noun that specifies the kind of \"options\". So translate as \"options about display\", not as \"display the options\".\n\nUsed in [[Special:Preferences]], tab \"Recent changes\". The display options refer to:\n* {{msg-mw|Recentchangesdays}}\n* {{msg-mw|Recentchangescount}}", "prefs-displaywatchlist": "\"Display\" is a noun that specifies the kind of \"options\". So translate as \"options about display\", not as \"display the options\".\n\nUsed in [[Special:Preferences]], tab \"Watchlist\". The display options refer to:\n* {{msg-mw|Prefs-watchlist-days}}\n* {{msg-mw|Prefs-watchlist-edits}}", + "prefs-changesrc": "Section heading in [[Special:Preferences]], tab \"Recent changes\". Describes the types of changes/edits that will be shown on Special:RecentChanges (the heading is followed by a list of checkboxes).", + "prefs-changeswatchlist": "Section heading in [[Special:Preferences]], tab \"Watchlist\". Describes the types of changes/edits that will be shown on Special:Watchlist (the heading is followed by a list of checkboxes).", + "prefs-pageswatchlist": "Section heading in [[Special:Preferences]], tab \"Watchlist\". Describes the types of pages that will be automatically added to the watchlist (the heading is followed by a list of checkboxes).", "prefs-tokenwatchlist": "Section heading.\nUsed in [[Special:Preferences]], tab \"Watchlist\".\n{{Identical|Token}}", "prefs-diffs": "Used in [[Special:Preferences]], tab \"Misc\".\n{{Identical|Diff}}", "prefs-help-prefershttps": "Used as help text for the checkbox in [[Special:Preferences]].\n\nThe checkbox has the label {{msg-mw|Tog-prefershttps}}.\n\nSee example: [[mw:Special:Preferences]].", -- 2.20.1