From ed0d4eb0e08e375da02a3954410426cdbc69f172 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 8 Nov 2013 21:17:27 +0100 Subject: [PATCH] Canonicalize text and update docs of messages using 'loginreqlink' Since 'loginreqlink' is being used as a part of patchwork messages we should try to keep the grammar the same in all of its uses. "You have to log in" / "You must log in" / "Please log in" were all used with various frequencies; I changed (hopefully) all uses to "Please log in". Two messages receiving 'loginreqlink' as a parameter do not currently use it: 'changeemail-no-info' and 'resetpass-no-info'. This is intentional, as they are less "positive" than the rest and thus should not link to the login form. Updated and cross-referenced qqq of 'loginreqlink' and messages using it. Change-Id: Ie245486051d6fbc72a596ba825bfd5d9e3a163bf --- languages/messages/MessagesEn.php | 10 +++++----- languages/messages/MessagesQqq.php | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 4894bf56416..b634765ffb7 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1421,7 +1421,7 @@ Note that you may not use the \"email this user\" feature unless you have a vali Your current IP address is $3, and the block ID is #$5. Please include all above details in any queries you make.", 'blockednoreason' => 'no reason given', -'whitelistedittext' => 'You have to $1 to edit pages.', +'whitelistedittext' => 'Please $1 to edit pages.', 'confirmedittext' => 'You must confirm your email address before editing pages. Please set and validate your email address through your [[Special:Preferences|user preferences]].', 'nosuchsectiontitle' => 'Cannot find section', @@ -1429,7 +1429,7 @@ Please set and validate your email address through your [[Special:Preferences|us It may have been moved or deleted while you were viewing the page.', 'loginreqtitle' => 'Login required', 'loginreqlink' => 'log in', -'loginreqpagetext' => 'You must $1 to view other pages.', +'loginreqpagetext' => 'Please $1 to view other pages.', 'accmailtitle' => 'Password sent', 'accmailtext' => "A randomly generated password for [[User talk:$1|$1]] has been sent to $2. It can be changed on the ''[[Special:ChangePassword|change password]]'' page upon logging in.", 'newarticle' => '(New)', @@ -1878,7 +1878,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.', 'preferences-summary' => '', # do not translate or duplicate this message to other languages 'mypreferences' => 'Preferences', 'prefs-edits' => 'Number of edits:', -'prefsnologintext2' => 'Please $1 to set user preferences.', +'prefsnologintext2' => 'Please $1 to change your preferences.', 'prefs-skin' => 'Skin', 'skin-preview' => 'Preview', 'datedefault' => 'No preference', @@ -2231,7 +2231,7 @@ Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.", 'reuploaddesc' => 'Cancel upload and return to the upload form', 'upload-tryagain' => 'Submit modified file description', 'uploadnologin' => 'Not logged in', -'uploadnologintext' => 'You must $1 to upload files.', +'uploadnologintext' => 'Please $1 to upload files.', 'upload_directory_missing' => 'The upload directory ($1) is missing and could not be created by the webserver.', 'upload_directory_read_only' => 'The upload directory ($1) is not writable by the webserver.', 'uploaderror' => 'Upload error', @@ -4522,7 +4522,7 @@ Please check your email address for invalid characters. Mailer returned: $1', 'confirmemail_invalid' => 'Invalid confirmation code. The code may have expired.', -'confirmemail_needlogin' => 'You need to $1 to confirm your email address.', +'confirmemail_needlogin' => 'Please $1 to confirm your email address.', 'confirmemail_success' => 'Your email address has been confirmed. You may now [[Special:UserLogin|log in]] and enjoy the wiki.', 'confirmemail_loggedin' => 'Your email address has now been confirmed.', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 483fd25bab7..7909b2f7c12 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -1599,7 +1599,10 @@ Used on the account creation form when creating another user's account. Similar 'resetpass_submit' => 'Submit button on [[Special:ChangePassword]]', 'changepassword-success' => 'Used in [[Special:ChangePassword]].', 'resetpass_forbidden' => "Used as error message in changing password. Maybe the external auth plugin won't allow local password changes.", -'resetpass-no-info' => 'Error message for [[Special:ChangePassword]].', +'resetpass-no-info' => 'Error message for [[Special:ChangePassword]]. + +Parameters: +* $1 (unused) - a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', 'resetpass-submit-loggedin' => 'Button on [[Special:ResetPass]] to submit new password. {{Identical|Change password}}', @@ -1670,7 +1673,10 @@ See also: 'changeemail' => 'Title of [[Special:ChangeEmail|special page]].', 'changeemail-header' => 'Header on [[Special:ChangeEmail]].', 'changeemail-text' => 'Text of [[Special:ChangeEmail]].', -'changeemail-no-info' => 'Error message for [[Special:ChangeEmail]].', +'changeemail-no-info' => 'Error message for [[Special:ChangeEmail]]. + +Parameters: +* $1 (unused) - a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', 'changeemail-oldemail' => 'Label for e-mail address field in [[Special:ChangeEmail]].', 'changeemail-newemail' => 'Label for e-mail address field in [[Special:ChangeEmail]].', 'changeemail-none' => "Probably appears in 'Current E-mail address' field when no address held, in [[Special:ChangeEmail]]. @@ -1861,10 +1867,14 @@ See also: {{Identical|Login required}}', 'loginreqlink' => 'Take a look on inflection. Used as $1 in the following messages: * {{msg-mw|loginreqpagetext}} +* {{msg-mw|exception-nologin-text-manual}} * {{msg-mw|whitelistedittext}} * {{msg-mw|Uploadnologintext}} -* {{msg-mw|watchlistanontext‎}} -* {{msg-mw|Confirmemail needlogin}} +* {{msg-mw|watchlistanontext}} +* {{msg-mw|confirmemail_needlogin}} +* {{msg-mw|changeemail-no-info}} +* {{msg-mw|resetpass-no-info}} +* {{msg-mw|prefsnologintext2}} {{Identical|Log in}}', 'loginreqpagetext' => 'This message is displayed if an anonymous reader attempts to access a page which is only available to logged-in users. @@ -9401,7 +9411,9 @@ See also: * {{msg-mw|Confirmemail oncreate}}', 'confirmemail_invalid' => 'Error message on [[Special:ConfirmEmail]] on error of confirmation.', 'confirmemail_needlogin' => 'Used on [[Special:ConfirmEmail]] when you are logged out. -* $1 is a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', + +Parameters: +* $1 - a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', 'confirmemail_success' => 'Explanation on [[Special:ConfirmEmail]] on completion of confirmation.', 'confirmemail_loggedin' => 'Explanation on [[Special:ConfirmEmail]] on completion of confirmation.', 'confirmemail_subject' => 'Subject of the e-mail sent to user during e-mail address confirmation -- 2.11.4.GIT