From: Alex Ivanov Date: Wed, 20 Nov 2013 20:58:45 +0000 (+0200) Subject: Change the syntax and non-one count fake values for {{PLURAL: in newmessages* X-Git-Tag: 1.31.0-rc.0~17940^2~1 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=0039bb8a1ad5bd315596f0b8d40ff52f97139492;p=lhc%2Fweb%2Fwiklou.git Change the syntax and non-one count fake values for {{PLURAL: in newmessages* Change the newmessageslinkplural and newmessagesdifflinkplural syntax and non-one count fake values to 999. Bug: 42497 Change-Id: I2a4b739314e524c3e70184766bb047cf54707c63 --- diff --git a/includes/Skin.php b/includes/Skin.php index a71bafcf97..750f319ad7 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1394,8 +1394,8 @@ abstract class Skin extends ContextSource { // Singular if no revision -> diff link will show latest change only in any case $plural = false; } - $plural = $plural ? 2 : 1; - // 2 signifies "more than one revision". We don't know how many, and even if we did, + $plural = $plural ? 999 : 1; + // 999 signifies "more than one revision". We don't know how many, and even if we did, // the number of revisions or authors is not necessarily the same as the number of // "messages". $newMessagesLink = Linker::linkKnown( diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 0766cd2df4..d7dadc8c31 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -943,8 +943,8 @@ See [[Special:Version|version page]].', 'newmessagesdifflink' => 'last change', 'youhavenewmessagesfromusers' => 'You have $1 from {{PLURAL:$3|another user|$3 users}} ($2).', 'youhavenewmessagesmanyusers' => 'You have $1 from many users ($2).', -'newmessageslinkplural' => '{{PLURAL:$1|a new message|new messages}}', -'newmessagesdifflinkplural' => 'last {{PLURAL:$1|change|changes}}', +'newmessageslinkplural' => '{{PLURAL:$1|a new message|999=new messages}}', +'newmessagesdifflinkplural' => 'last {{PLURAL:$1|change|999=changes}}', 'youhavenewmessagesmulti' => 'You have new messages on $1', 'newtalkseparator' => ', ', # do not translate or duplicate this message to other languages 'editsection' => 'edit', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 7639c3cdbe..aa849ebd52 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -857,17 +857,19 @@ See also: Used as $1 in {{msg-mw|Youhavenewmessagesfromusers}}. Parameters: -* $1 - 1 or 2: +* $1 - 1 or 999: ** 1 - if there was '''one''' new edit since the last time the user has seen their talk page -** 2 - if there was '''more than one''' new edit since the last time the user has seen their talk page +** 999 - if there was '''more than one''' new edit since the last time the user has seen their talk page {{Identical|New messages}}", -'newmessagesdifflinkplural' => 'Parameters: -* $1 - the number of new edits since the last time the user has seen their talk page: it should be used only for correct [[plural]] as in the source text, as the exact number is not relevant. - -Like {{msg-mw|Newmessagesdifflink}} but supporting pluralization. +'newmessagesdifflinkplural' => "Like {{msg-mw|Newmessagesdifflink}} but supporting pluralization. Used as $2 in message {{msg-mw|Youhavenewmessagesfromusers}}. -{{Identical|Last change}}', + +Parameters: +* $1 - 1 or 999: +** 1 - if there was '''one''' new edit since the last time the user has seen their talk page +** 999 - if there was '''more than one''' new edit since the last time the user has seen their talk page +{{Identical|Last change}}", 'youhavenewmessagesmulti' => 'The alternative of {{msg-mw|youhavenewmessages}} as used on wikis with a special setup so they can receive the "new message" notice on other wikis as well. Used on [http://www.wikia.com/ Wikia]. The format is: "{{int:youhavenewmessagesmulti| [[MediaWiki:Newmessageslink/{{SUBPAGENAME}}|{{int:newmessageslink}}]]}}"