[MediaWiki-commits] [Gerrit] Corresponding changes for Echo 99+ refactoring - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Corresponding changes for Echo 99+ refactoring
..
Corresponding changes for Echo 99+ refactoring
Also fixed this for newtopic bundle which says it has a cap of 250,
but did not actually AFAICT.
Also, change 1 to One/one, per Siebrand on the task. This can easily
be dropped/undone if we don't want it.
Remove unused functions
Bug: T127288
Change-Id: Ibfa56b1af9e8c56b4c5f900e0d487bc09688b2a2
Depends-On: Iabeaae747f99980c0610d552f6b38f89d940b890
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/FlowPresentationModel.php
M includes/Notifications/Formatter.php
M includes/Notifications/NewTopicPresentationModel.php
M includes/Notifications/PostReplyPresentationModel.php
6 files changed, 38 insertions(+), 37 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index bb7d7eb..6cc4205 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -256,7 +256,7 @@
"flow-history-week": "Last week",
"flow-history-pages-topic": "Appears on [$1 \"$2\" board]",
"flow-history-pages-post": "Appears on [$1 $2]",
- "flow-topic-comments": "{{PLURAL:$1|$1 comment|$1
comments|0={{GENDER:$2|Be the first}} to comment!}}",
+ "flow-topic-comments": "{{PLURAL:$1|One comment|$1
comments|0={{GENDER:$2|Be the first}} to comment!}}",
"flow-show-comments-title": "{{PLURAL:$1|View comment|View comments}}",
"flow-hide-comments-title": "{{PLURAL:$1|Hide comment|Hide comments}}",
"flow-comment-restored": "Restored comment",
@@ -266,20 +266,20 @@
"flow-last-modified": "Last modified about $1",
"flow-workflow": "workflow",
"flow-notification-reply": "[$5 $2]$1 {{GENDER:$1|responded}} on
'''$4'''.",
- "flow-notification-reply-bundle": "[$4 $2]$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|responded}} on '''$3'''.",
+ "flow-notification-reply-bundle": "[$4 $2]$1 and {{PLURAL:$5|one other|$5
others|100=99+ others}} {{GENDER:$1|responded}} on '''$3'''.",
"flow-notification-edit": "[$6 $2]$1 has {{GENDER:$1|edited}} your
[$5 post] on [[$3|$4]].",
- "flow-notification-edit-bundle": "$1 and $5 {{PLURAL:$6|other|others}}
{{GENDER:$1|edited}} a [$4 post] in \"$2\" on
\"$3\".",
+ "flow-notification-edit-bundle": "$1 and {{PLURAL:$5|one other|$5
others|100=99+ others}} {{GENDER:$1|edited}} a [$4
post] in \"$2\" on \"$3\".",
"notification-header-flow-new-topic-v2": "New topic created on
'''$3''': \"'''$4'''\".",
- "notification-bundle-header-flow-new-topic": "$1 new
{{PLURAL:$2|topic|topics}} on '''$3'''.",
+ "notification-bundle-header-flow-new-topic": "$1 new
{{PLURAL:$1|topic|topics}} on '''$3'''.",
"notification-body-flow-new-topic-v2": "$1",
"notification-header-flow-new-topic-user-talk": "A new topic was
created on '''your talk page''': \"'''$4'''\".",
- "notification-bundle-header-flow-new-topic-user-talk": "$1 new
{{PLURAL:$2|topic|topics}} on '''your talk page'''.",
+ "notification-bundle-header-flow-new-topic-user-talk": "$1 new
{{PLURAL:$1|topic|topics}} on '''your talk page'''.",
"notification-body-flow-new-topic-user-talk": "$1",
"notification-header-flow-post-reply": "$1 {{GENDER:$2|replied}} in
\"'''$4'''\".",
- "notification-bundle-header-flow-post-reply-v2": "$1 new
{{PLURAL:$2|reply|replies}} in \"'''$3'''\".",
+ "notification-bundle-header-flow-post-reply-v2": "$1 new
{{PLURAL:$1|reply|replies}} in \"'''$3'''\".",
"notification-body-flow-post-reply-v2": "$1",
"notification-header-flow-post-reply-user-talk": "$1
{{GENDER:$2|posted}} a reply on '''your talk page''' in \"'''$4'''\".",
- "notification-bundle-header-flow-post-reply-user-talk": "$1 new
{{PLURAL:$2|reply|replies}} on '''your talk page''' in \"'''$3'''\".",
+ "notification-bundle-header-flow-post-reply-user-talk": "$1 new
{{PLURAL:$1|reply|replies}} on '''your talk page''' in \"'''$3'''\".",
"notification-body-flow-post-reply-user-talk": "$1",
"notification-header-flow-post-edited-v2": "{{GENDER:$2|Your}} post in
\"'''$1'''\" was edited.",
"notification-bundle-header-flow-post-edited-v2": "{{GENDER:$2|Your}}
post in \"'''$1'''\" was edited multiple times.",
@@ -299,7 +299,7 @@
"notification-body-flow-summary-edited-user-talk": "$1",
"notification-email-subject-flow-summary-edited": "$1
{{GENDER:$1|updated}} the summary on $2.",
"notification-email-batch-body-flow-summary-edited": "$1
{{GENDER:$1|updated}} the summary on $2.",
- "notification-email-batch-bundle-body-flow-summary-edited": "$1 and $3
{{PLURAL:$4|other|others}} {{GENDER:$1|updated}} the summary on $2",
+ "notification-email-batch-bundle-body-flow-summary-edited": "$1 and
{{PLURAL:$3|one other|$
[MediaWiki-commits] [Gerrit] Corresponding changes for Echo 99+ refactoring - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276099
Change subject: Corresponding changes for Echo 99+ refactoring
..
Corresponding changes for Echo 99+ refactoring
Also fixed this for newtopic bundle which says it has a cap of 250,
but did not actually AFAICT.
Change-Id: Ibfa56b1af9e8c56b4c5f900e0d487bc09688b2a2
Depends-On: Iabeaae747f99980c0610d552f6b38f89d940b890
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/FlowPresentationModel.php
M includes/Notifications/Formatter.php
M includes/Notifications/NewTopicPresentationModel.php
M includes/Notifications/PostReplyPresentationModel.php
6 files changed, 37 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/99/276099/1
diff --git a/i18n/en.json b/i18n/en.json
index 7727cf8..ca9f636 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -266,20 +266,20 @@
"flow-last-modified": "Last modified about $1",
"flow-workflow": "workflow",
"flow-notification-reply": "[$5 $2]$1 {{GENDER:$1|responded}} on
'''$4'''.",
- "flow-notification-reply-bundle": "[$4 $2]$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|responded}} on '''$3'''.",
+ "flow-notification-reply-bundle": "[$4 $2]$1 and {{PLURAL:$5|one other|$5
others|100=99+ others}} {{GENDER:$1|responded}} on '''$3'''.",
"flow-notification-edit": "[$6 $2]$1 has {{GENDER:$1|edited}} your
[$5 post] on [[$3|$4]].",
- "flow-notification-edit-bundle": "$1 and $5 {{PLURAL:$6|other|others}}
{{GENDER:$1|edited}} a [$4 post] in \"$2\" on
\"$3\".",
+ "flow-notification-edit-bundle": "$1 and {{PLURAL:$5|one other|$5
others|100=99+ others}} {{GENDER:$1|edited}} a [$4
post] in \"$2\" on \"$3\".",
"notification-header-flow-new-topic-v2": "New topic created on
'''$3''': \"'''$4'''\".",
- "notification-bundle-header-flow-new-topic": "$1 new
{{PLURAL:$2|topic|topics}} on '''$3'''.",
+ "notification-bundle-header-flow-new-topic": "$1 new
{{PLURAL:$1|topic|topics}} on '''$3'''.",
"notification-body-flow-new-topic-v2": "$1",
"notification-header-flow-new-topic-user-talk": "A new topic was
created on '''your talk page''': \"'''$4'''\".",
- "notification-bundle-header-flow-new-topic-user-talk": "$1 new
{{PLURAL:$2|topic|topics}} on '''your talk page'''.",
+ "notification-bundle-header-flow-new-topic-user-talk": "$1 new
{{PLURAL:$1|topic|topics}} on '''your talk page'''.",
"notification-body-flow-new-topic-user-talk": "$1",
"notification-header-flow-post-reply": "$1 {{GENDER:$2|replied}} in
\"'''$4'''\".",
- "notification-bundle-header-flow-post-reply-v2": "$1 new
{{PLURAL:$2|reply|replies}} in \"'''$3'''\".",
+ "notification-bundle-header-flow-post-reply-v2": "$1 new
{{PLURAL:$1|reply|replies}} in \"'''$3'''\".",
"notification-body-flow-post-reply-v2": "$1",
"notification-header-flow-post-reply-user-talk": "$1
{{GENDER:$2|posted}} a reply on '''your talk page''' in \"'''$4'''\".",
- "notification-bundle-header-flow-post-reply-user-talk": "$1 new
{{PLURAL:$2|reply|replies}} on '''your talk page''' in \"'''$3'''\".",
+ "notification-bundle-header-flow-post-reply-user-talk": "$1 new
{{PLURAL:$1|reply|replies}} on '''your talk page''' in \"'''$3'''\".",
"notification-body-flow-post-reply-user-talk": "$1",
"notification-header-flow-post-edited-v2": "{{GENDER:$2|Your}} post in
\"'''$1'''\" was edited.",
"notification-bundle-header-flow-post-edited-v2": "{{GENDER:$2|Your}}
post in \"'''$1'''\" was edited multiple times.",
@@ -299,7 +299,7 @@
"notification-body-flow-summary-edited-user-talk": "$1",
"notification-email-subject-flow-summary-edited": "$1
{{GENDER:$1|updated}} the summary on $2.",
"notification-email-batch-body-flow-summary-edited": "$1
{{GENDER:$1|updated}} the summary on $2.",
- "notification-email-batch-bundle-body-flow-summary-edited": "$1 and $3
{{PLURAL:$4|other|others}} {{GENDER:$1|updated}} the summary on $2",
+ "notification-email-batch-bundle-body-flow-summary-edited": "$1 and
{{PLURAL:$3|one other|$3 others|100=99+ others}} {{GENDER:$1|updated}} the
summary on $2",
"notification-header-flow-mention-post": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$4|you}} in \"'''$5'''\".",
"notification-header-flow-mention-header": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$4|you}} in the description of '''$3'''.",
"notification-header-flow-mention-post-summary": "$1
{{GENDER:$2|mentioned}} {{GENDER:$4|you}} in \"'''$5'''\".",
@@ -314,9 +314,9 @@
"notification-links-flow-description-edited-view-page":
"{{GENDER:$1|View}} page",
"notification-email-subject-flow-description-edited": "$1
{{GENDER:$1|edited}} the description on $2.",
"notification-email-batch-body-flow-description
