jenkins-bot has submitted this change and it was merged.
Change subject: Fix i18n introduced in cf47618cf3f9012596e0ecaf434f665ce944d542
......................................................................
Fix i18n introduced in cf47618cf3f9012596e0ecaf434f665ce944d542
* Special case for 2 participants should be prefixed with 2=, leaving the
unprefixed form for regular plural forms (all other non-2 plural cases)
* Moved special cased 0= and 2= to the end
* Added plural for "others"
Change-Id: I1306e16342b4605f5dc3d63d5f148ab7dcd4a036
---
M Flow.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 420ffd9..a9ff85c 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -94,7 +94,7 @@
'flow-rev-message-censored-post' => 'Censored post',
'flow-topic-history' => 'Topic history',
- 'flow-topic-participants' => '{{PLURAL:$1|0=No participation yet|$3
started this topic|{{GENDER:$3|$3}} and {{GENDER:$4|$4}}|{{GENDER:$3|$3}},
{{GENDER:$4|$4}} and $2 others}}',
+ 'flow-topic-participants' => '{{PLURAL:$1|$3 started this
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and {{PLURAL:$2|other|others}}|0=No
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4}}}}',
'flow-topic-comments' => '{{PLURAL:$1|0=Be the first to
comment!|Comment ($1)}}',
'flow-comment-restored' => 'Restored comment',
@@ -305,7 +305,7 @@
{{Identical|Topic history}}',
'flow-topic-participants' => 'Message to display the amount of
participants in this discussion (and potentially a couple of names). Parameters:
* $1: The total amount of participants in the conversation, can be used for
PLURAL
-* $2: The total amount of participants minus 2, can be used to generate a
message like (X, Y and $2 others)
+* $2: The total amount of participants minus 2, can be used to generate a
message like: X, Y and $2 others ($3 and $4 will be usernames)
* $3: Username of the topic starter, can be used for GENDER
* $4: Username of a second participant (if there is a second, otherwise not
available), can be used for GENDER',
'flow-topic-comments' => 'Message to display the amount of comments in
this discussion. Parameters:
--
To view, visit https://gerrit.wikimedia.org/r/90904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1306e16342b4605f5dc3d63d5f148ab7dcd4a036
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
