jenkins-bot has submitted this change and it was merged.
Change subject: Adding i18n msg for merge request email
..
Adding i18n msg for merge request email
Change-Id: I1d1d2b693b663e4e3219e52d4a325b55c30232c5
---
M CentralAuth.i18n.php
1 file changed, 31 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php
index 7e17e0a..b312a10 100644
--- a/CentralAuth.i18n.php
+++ b/CentralAuth.i18n.php
@@ -419,6 +419,26 @@
If you are just trying to log in as another user, please log out first.',
'centralauth-warning-notloggedin' = 'You are not currently logged in.',
'centralauth-warning-notattached' = 'The local account is not attached
to a global one.',
+
+ // Final unification
+ 'centralauth-finishglobaliseemail_subject' = '{{SITENAME}} account
confirmation',
+ 'centralauth-finishglobaliseemail_body' = 'Your email address has been
set as associated
+with the account $2 on all Wikimedia projects, with your main account being
+on {{SITENAME}}.
+
+To confirm that this account really does belong to you, merge in any of your
+accounts that we could not do automatically, and allow you to recover your
+account if you lose your password, please open this link in your browser:
+
+$3
+
+If the account does *not* belong to you, follow this link to cancel the email
+address confirmation:
+
+$5
+
+This confirmation code will expire at $4.'
+
);
/** Message documentation (Message documentation)
@@ -902,6 +922,17 @@
'centralauth-completelogin-submit' = 'Used as label for the Submit
button.',
'centralauth-completelogin-back' = 'Used as action link text.',
'centralauth-warning-notloggedin' = 'Used as error message.',
+
+ // Final unification
+ 'centralauth-finishglobaliseemail_subject' = 'Subject field for
account confirmation emails',
+ 'centralauth-finishglobaliseemail_body' = 'Body text for account
confirmation emails
+* $1 is the IP address of the user that changed the e-mail address
+* $2 is the name of the user
+* $3 is a URL to Special:ConfirmEmail
+* $4 is a time and date (duplicated by $6 and $7)
+* $5 is a URL to Special:InvalidateEmail
+* $6 is a date
+* $7 is a time',
);
/** Afrikaans (Afrikaans)
--
To view, visit https://gerrit.wikimedia.org/r/63731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d1d2b693b663e4e3219e52d4a325b55c30232c5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Pgehres pgeh...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
