summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Horohoe <chadh@wikimedia.org>2013-08-28 10:57:57 -0700
committerChad Horohoe <chadh@wikimedia.org>2013-08-28 13:08:12 -0700
commit4ca6ce9b2e33241e63ecdde233391fcce62bce65 (patch)
treeff2cb2241ea38f2f961c4ced4b754877068268e5
parentd1067f79533ea4599ac6c385374a774bd84e8796 (diff)
Add help message to prefershttpsorigin/wmf/1.22wmf13
The preference requires logging back in again to set the new cookies. Change-Id: I2602205eec752c927ac6df81545e69f5c9e70ee4
-rw-r--r--includes/Preferences.php1
-rw-r--r--languages/messages/MessagesEn.php1
-rw-r--r--languages/messages/MessagesQqq.php1
-rw-r--r--maintenance/language/messages.inc1
4 files changed, 4 insertions, 0 deletions
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 7f90e0ef533a..18de3023f1ff 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -319,6 +319,7 @@ class Preferences {
$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 dcfc93178bf6..db4d5df87ae4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2020,6 +2020,7 @@ Your email address is not revealed when other users contact you.',
'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 dd03458c3355..b38646ea5eec 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2954,6 +2954,7 @@ Used in [[Special:Preferences]], tab "Watchlist". The display options refer to:
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 e2cc506c09ca..9c9ebaee268a 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1141,6 +1141,7 @@ $wgMessageStructure = array(
'prefs-displaywatchlist',
'prefs-tokenwatchlist',
'prefs-diffs',
+ 'prefs-help-prefershttps',
),
'preferences-email' => array(
'email-address-validity-valid',