Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93911
Change subject: Talk about email addresses being “confirmed”, not “authorized”,
on Special:ConfirmEmail and Special:Preferences.
......................................................................
Talk about email addresses being “confirmed”, not “authorized”, on
Special:ConfirmEmail and Special:Preferences.
* Add the “emailconfirmed” and “emailnotconfirmed” messages, which
* supersede “emailauthorized” and “emailnotauthorized”
* Deprecate the time ($1) parameeter in the “emailconfirmed” message
Change-Id: Iea5b1deaf6f224da093fa7bcd3fc00aa88e58f41
---
M includes/Preferences.php
M includes/specials/SpecialConfirmemail.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
4 files changed, 17 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/93911/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..a7d42c5 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -472,20 +472,18 @@
if ( $user->getEmail() ) {
if (
$user->getEmailAuthenticationTimestamp() ) {
// date and time are separate
parameters to facilitate localisation.
- // $time is kept for backward
compat reasons.
- // 'emailauthenticated' is also
used in SpecialConfirmemail.php
+ // 'emailconfirmed' is also
used in SpecialConfirmemail.php
$displayUser =
$context->getUser();
$emailTimestamp =
$user->getEmailAuthenticationTimestamp();
- $time = $lang->userTimeAndDate(
$emailTimestamp, $displayUser );
$d = $lang->userDate(
$emailTimestamp, $displayUser );
$t = $lang->userTime(
$emailTimestamp, $displayUser );
- $emailauthenticated =
$context->msg( 'emailauthenticated',
- $time, $d, $t
)->parse() . '<br />';
+ $emailauthenticated =
$context->msg( 'emailconfirmed',
+ $d, $t )->parse() .
'<br />';
$disableEmailPrefs = false;
$emailauthenticationclass =
'mw-email-authenticated';
} else {
$disableEmailPrefs = true;
- $emailauthenticated =
$context->msg( 'emailnotauthenticated' )->parse() . '<br />' .
+ $emailauthenticated =
$context->msg( 'emailnotconfirmed' )->parse() . '<br />' .
Linker::linkKnown(
SpecialPage::getTitleFor( 'Confirmemail' ),
$context->msg(
'emailconfirmlink' )->escaped()
diff --git a/includes/specials/SpecialConfirmemail.php
b/includes/specials/SpecialConfirmemail.php
index 6757990..217e66e 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -92,14 +92,12 @@
}
} elseif ( $user->isEmailConfirmed() ) {
// date and time are separate parameters to facilitate
localisation.
- // $time is kept for backward compat reasons.
- // 'emailauthenticated' is also used in
SpecialPreferences.php
+ // 'emailconfirmed' is also used in
SpecialPreferences.php
$lang = $this->getLanguage();
$emailAuthenticated =
$user->getEmailAuthenticationTimestamp();
- $time = $lang->userTimeAndDate( $emailAuthenticated,
$user );
$d = $lang->userDate( $emailAuthenticated, $user );
$t = $lang->userTime( $emailAuthenticated, $user );
- $out->addWikiMsg( 'emailauthenticated', $time, $d, $t );
+ $out->addWikiMsg( 'emailconfirmed', $d, $t );
} else {
if ( $user->isEmailConfirmationPending() ) {
$out->wrapWikiMsg(
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 7b62d29..2dc37f4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1229,8 +1229,11 @@
'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP
address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which
is the maximum allowed in this time period.
As a result, visitors using this IP address cannot create any more accounts at
the moment.',
'emailauthenticated' => 'Your email address was authenticated on
$2 at $3.',
+'emailconfirmed' => 'Your email address was confirmed on $1
at $2.',
'emailnotauthenticated' => 'Your email address is not yet
authenticated.
No email will be sent for any of the following features.',
+'emailnotconfirmed' => 'Your email address is not yet confirmed.
+No email will be sent for any of the following features.',
'noemailprefs' => 'Specify an email address in your
preferences for these features to work.',
'emailconfirmlink' => 'Confirm your email address',
'invalidemailaddress' => 'The email address cannot be accepted as
it appears to have an invalid format.
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 9d58538..6f88b62 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1519,9 +1519,17 @@
* $1 - (Unused) obsolete, date and time
* $2 - date
* $3 - time',
+'emailconfirmed' => 'In user preferences ([[Special:Preferences]] >
{{int:prefs-personal}} > {{int:email}}) and on [[Special:ConfirmEmail]].
+
+Parameters:
+* $1 - date
+* $2 - time',
'emailnotauthenticated' => 'Message in [[Special:Preferences]] >
{{int:prefs-personal}} > {{int:email}}.
It appears after saving your email address but before it has been
authenticated.',
+'emailnotconfirmed' => 'Message in [[Special:Preferences]] >
{{int:prefs-personal}} > {{int:email}}.
+
+It appears after saving your email address but before it has been
authenticated.',
'noemailprefs' => 'Message appearing in the "Email options" section of the
"User profile" page in [[Special:Preferences|Preferences]], when no user email
address has been entered.',
'emailconfirmlink' => 'Link to [[Special:ConfirmEmail]].
--
To view, visit https://gerrit.wikimedia.org/r/93911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea5b1deaf6f224da093fa7bcd3fc00aa88e58f41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phuedx <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
