r98076 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98075‎ | r98076 | r98077 >
Date:18:43, 25 September 2011
Author:raymond
Status:ok (Comments)
Tags:
Comment:
email -> e-mail for consistency
Modified paths:
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -1183,8 +1183,8 @@
11841184 'passwordreset-pretext' => '{{PLURAL:$1||Enter one of the pieces of data below}}',
11851185 'passwordreset-username' => 'Username:',
11861186 'passwordreset-domain' => 'Domain:',
1187 -'passwordreset-capture' => 'View the resulting email?',
1188 -'passwordreset-capture-help' => 'If you check this box, the email (with the temporary password) will be shown to you as well as being sent to the user.',
 1187+'passwordreset-capture' => 'View the resulting e-mail?',
 1188+'passwordreset-capture-help' => 'If you check this box, the e-mail (with the temporary password) will be shown to you as well as being sent to the user.',
11891189 'passwordreset-email' => 'E-mail address:',
11901190 'passwordreset-emailtitle' => 'Account details on {{SITENAME}}',
11911191 'passwordreset-emailtext-ip' => 'Someone (probably you, from IP address $1) requested a reminder of your
@@ -1984,7 +1984,7 @@
19851985 'right-siteadmin' => 'Lock and unlock the database',
19861986 'right-override-export-depth' => 'Export pages including linked pages up to a depth of 5',
19871987 'right-sendemail' => 'Send e-mail to other users',
1988 -'right-passwordreset' => 'View password reset emails',
 1988+'right-passwordreset' => 'View password reset e-mails',
19891989
19901990 # User rights log
19911991 'rightslog' => 'User rights log',
@@ -2775,7 +2775,7 @@
27762776 Your friendly {{SITENAME}} notification system
27772777
27782778 --
2779 -To change your email notification settings, visit
 2779+To change your e-mail notification settings, visit
27802780 {{canonicalurl:{{#special:Preferences}}}}
27812781
27822782 To change your watchlist settings, visit

Follow-up revisions

RevisionCommit summaryAuthorDate
r981841.18wmf1: MFT part of r98076 so LocalisationUpdate won't break for enotif_bod...catrope22:10, 26 September 2011
r984441.18wmf1 MFT r93431, r98076, r98185reedy20:32, 29 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r98029(bug 30636) integrate the remaining functionality of the PasswordReset extens...happy-melon21:11, 24 September 2011

Comments

#Comment by Catrope (talk | contribs)   22:08, 26 September 2011

Needs to be in 1.18wmf1 in order to not break LocalisationUpdate for this message. This message in particular is important because of the canonicalurl stuff.

#Comment by G.Hagedorn (talk | contribs)   08:32, 30 September 2011

Please consider tagging for 1.18 as well

Status & tagging log