Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/237614
Change subject: Add GENDER support for opt-in Echo messages
......................................................................
Add GENDER support for opt-in Echo messages
All of them now have agent & title params (in that order,
for consistency). Changed i18n key for the first 2 messages
because we'll need new translations after changing $1.
Bug: T98270
Change-Id: I96a1e925a720603c9eac257a70b1553977292635
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/Notifications.php
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/14/237614/1
diff --git a/i18n/en.json b/i18n/en.json
index ef6e3ae..8090365 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -566,8 +566,8 @@
"flow-talk-page-beta-feature-message": "Flow on user talk",
"flow-talk-page-beta-feature-description": "Enables a new structured
discussion system on {{GENDER:|your}} user talk page. Flow simplifies talk page
discussions with clear places to write and reply, and allows conversation-level
notifications. Existing wikitext discussions are moved to an archive. This
feature is not auto-enabled; users will have to enable it separately. Disabling
this feature will move the Flow board to a subpage and un-archive the previous
talkpage.",
"flow-notification-link-text-enabled-on-talkpage": "View user talk
page",
- "flow-notification-enabled-on-talkpage-title-message": "New discussion
system enabled for your user talk page<br /><small>Available at [[$1]]</small>",
- "flow-notification-enabled-on-talkpage-email-subject": "New discussion
system on $1",
+ "flow-notification-enabled-on-talkpage-title": "New discussion system
enabled for {{GENDER:$1|your}} user talk page<br /><small>Available at
[[$2]]</small>",
+ "flow-notification-enabled-on-talkpage-email-subject-message": "New
discussion system on $2",
"flow-notification-enabled-on-talkpage-email-batch-body": "Flow, the
new wiki discussion system, has been enabled on {{GENDER:$1|your}} user talk
page on {{SITENAME}}. You can get more information, provide feedback or disable
the new system any time from the Beta features section in {{GENDER:$1|your}}
preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive
template",
"flow-beta-feature-remove-archive-template-edit-summary": "Removing
archive template",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 77cc592..59ca542 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -574,9 +574,9 @@
"flow-talk-page-beta-feature-message": "Title of the beta feature to
enable Flow on the user's talk page.",
"flow-talk-page-beta-feature-description": "Description of the beta
feature to enable Flow on the user's talk page.",
"flow-notification-link-text-enabled-on-talkpage": "Primary link text
in email for notification when Flow was enabled on your talk page.",
- "flow-notification-enabled-on-talkpage-title-message": "Text of the web
notification when Flow was enabled on your talk page.\n Parameters:\n* $1 -
Title where Flow was enabled.",
- "flow-notification-enabled-on-talkpage-email-subject": "Email subject
for notification when Flow was enabled on your talk page.\n Parameters:\n* $1 -
Title where Flow was enabled.",
- "flow-notification-enabled-on-talkpage-email-batch-body": "Email body
for notification when Flow was enabled on your talk page.\n Parameters:\n* $1 -
User name for gender.",
+ "flow-notification-enabled-on-talkpage-title": "Text of the web
notification when Flow was enabled on your talk page.\n Parameters:\n* $1 - the
username. Can be used for GENDER.\n* $2 - Title where Flow was enabled.",
+ "flow-notification-enabled-on-talkpage-email-subject-message": "Email
subject for notification when Flow was enabled on your talk page.\n
Parameters:\n* $1 - the username. Can be used for GENDER.\n* $2 - Title where
Flow was enabled.",
+ "flow-notification-enabled-on-talkpage-email-batch-body": "Email body
for notification when Flow was enabled on your talk page.\n Parameters:\n* $1 -
the username. Can be used for GENDER.\n* $2 - Title where Flow was enabled.",
"flow-beta-feature-add-archive-template-edit-summary": "Edit summary
message for the revision adding the archive template to an archived talk page.",
"flow-beta-feature-remove-archive-template-edit-summary": "Edit summary
message for the revision removing the archive template to an archived talk
page.",
"flow-dialog-cancelconfirm-title": "Title of the dialog that appears
when the user cancels an edit and verifies whether the user wants to discard
their edits or continue editing.\n{{Identical|Are you sure?}}",
diff --git a/includes/Notifications/Notifications.php
b/includes/Notifications/Notifications.php
index 2da25b2..d92d315 100644
--- a/includes/Notifications/Notifications.php
+++ b/includes/Notifications/Notifications.php
@@ -112,12 +112,12 @@
'message' =>
'flow-notification-link-text-enabled-on-talkpage',
'destination' => 'title'
),
- 'title-message' =>
'flow-notification-enabled-on-talkpage-title-message',
- 'title-params' => array( 'title' ),
- 'email-subject-message' =>
'flow-notification-enabled-on-talkpage-email-subject',
- 'email-subject-params' => array( 'title' ),
+ 'title-message' =>
'flow-notification-enabled-on-talkpage-title',
+ 'title-params' => array( 'agent', 'title' ),
+ 'email-subject-message' =>
'flow-notification-enabled-on-talkpage-email-subject-message',
+ 'email-subject-params' => array( 'agent', 'title' ),
'email-body-batch-message' =>
'flow-notification-enabled-on-talkpage-email-batch-body',
- 'email-body-batch-params' => array( 'agent' ),
+ 'email-body-batch-params' => array( 'agent', 'title' ),
) + $notificationTemplate,
);
--
To view, visit https://gerrit.wikimedia.org/r/237614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96a1e925a720603c9eac257a70b1553977292635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
