Chad has submitted this change and it was merged.
Change subject: Add help message to prefershttps
......................................................................
Add help message to prefershttps
The preference requires logging back in again to set the new cookies.
Change-Id: I2602205eec752c927ac6df81545e69f5c9e70ee4
---
M includes/Preferences.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
4 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Chad: Verified; Looks good to me, approved
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 84a3b7e..bb6fbbc 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -307,6 +307,7 @@
$defaultPreferences['prefershttps'] = array(
'type' => 'toggle',
'label-message' => 'tog-prefershttps',
+ 'help-message' => 'prefs-help-prefershttps',
'section' => 'personal/info'
);
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 414a0f2..b86c84a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2018,6 +2018,7 @@
'prefs-displaywatchlist' => 'Display options',
'prefs-tokenwatchlist' => 'Token',
'prefs-diffs' => 'Diffs',
+'prefs-help-prefershttps' => 'This preference will take effect on your
next login.',
# User preference: email validation using jQuery
'email-address-validity-valid' => 'Email address appears valid',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index ac94856..f1ee882 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3013,6 +3013,7 @@
Used in [[Special:Preferences]], tab "Watchlist".
{{Identical|Token}}',
'prefs-diffs' => 'Used in [[Special:Preferences]], tab "Misc".',
+'prefs-help-prefershttps' => 'Used in [[Special:Preferences]] as help text for
the "use secure login" option',
# User preference: email validation using jQuery
'email-address-validity-valid' => 'Used as hint for
{{msg-mw|changeemail-newemail}} field in [[Special:ChangeEmail]], when the
provided E-mail address is valid.',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 68b2d17..6ffe7de 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1141,6 +1141,7 @@
'prefs-displaywatchlist',
'prefs-tokenwatchlist',
'prefs-diffs',
+ 'prefs-help-prefershttps',
),
'preferences-email' => array(
'email-address-validity-valid',
--
To view, visit https://gerrit.wikimedia.org/r/81565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2602205eec752c927ac6df81545e69f5c9e70ee4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf14
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
