From dd70d9e71f9f0a0cab6d856d2fcd50965fc3759e Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 26 Nov 2018 10:43:59 -0800 Subject: [PATCH] Preferences: Remove unused message for RC/Watchlist opt-out section Also remove the mapping from "optoutwatchlist" and "optoutrc" to "opt-out". Bug: T207741 Change-Id: I7aecf11496d2f13d11944b5ce1910362c4268ad4 Follows-Up: I8d6795f5e39fa5bceabd2da5e6a5b43d009a3bab --- includes/specials/forms/PreferencesFormOOUI.php | 3 +-- languages/i18n/en.json | 1 - languages/i18n/qqq.json | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/includes/specials/forms/PreferencesFormOOUI.php b/includes/specials/forms/PreferencesFormOOUI.php index bf4d9af80e..81abf1c8e1 100644 --- a/includes/specials/forms/PreferencesFormOOUI.php +++ b/includes/specials/forms/PreferencesFormOOUI.php @@ -227,8 +227,7 @@ class PreferencesFormOOUI extends OOUIHTMLForm { * @return string */ function getLegend( $key ) { - $aliasKey = ( $key === 'optoutwatchlist' || $key === 'optoutrc' ) ? 'opt-out' : $key; - $legend = parent::getLegend( $aliasKey ); + $legend = parent::getLegend( $key ); Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] ); return $legend; } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 72e67163e6..b2a755dbcd 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1139,7 +1139,6 @@ "prefs-editor": "Editor", "prefs-preview": "Preview", "prefs-advancedrc": "Advanced options", - "prefs-opt-out": "Opt out of improvements", "prefs-advancedrendering": "Advanced options", "prefs-advancedsearchoptions": "Advanced options", "prefs-advancedwatchlist": "Advanced options", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 182dc42fee..26fed9465f 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1342,7 +1342,6 @@ "prefs-editor": "Used in [[Special:Preferences]], tab \"Editing\" ({{int:prefs-editing}}).\n\n{{Identical|Editor}}", "prefs-preview": "Used in [[Special:Preferences]], tab \"Editing\".\n{{Identical|Preview}}", "prefs-advancedrc": "Used in [[Special:Preferences]], tab \"Recent changes\".\n{{Identical|Advanced options}}", - "prefs-opt-out": "Used in [[Special:Preferences]], tabs \"Recent changes\" and \"Watchlist\".", "prefs-advancedrendering": "Used in [[Special:Preferences]], tab \"Appearence\".\n{{Identical|Advanced options}}", "prefs-advancedsearchoptions": "Used in [[Special:Preferences]], tab \"Search options\".\n{{Identical|Advanced options}}", "prefs-advancedwatchlist": "Used in [[Special:Preferences]], tab \"Watchlist\".\n{{Identical|Advanced options}}", -- 2.20.1