Bsitu has uploaded a new change for review. https://gerrit.wikimedia.org/r/159864
Change subject: Update flow reply subject ...................................................................... Update flow reply subject This needs the Echo patch: https://gerrit.wikimedia.org/r/#/c/159840/ Change-Id: I1fc06d81f17d4f54c5d5abfbdc5450d0becbef24 --- M i18n/en.json M i18n/qqq.json M includes/Notifications/Notifications.php 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/64/159864/1 diff --git a/i18n/en.json b/i18n/en.json index 96e7eea..07c51a3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -225,7 +225,7 @@ "flow-notification-mention": "$1 {{GENDER:$1|mentioned}} {{GENDER:$5|you}} in {{GENDER:$1|his|her|their}} <span class=\"plainlinks\">[$2 post]</span> in \"$3\" on \"$4\".", "flow-notification-link-text-view-post": "View post", "flow-notification-link-text-view-topic": "View topic", - "flow-notification-reply-email-subject": "$1 {{GENDER:$1|responded}} to a topic", + "flow-notification-reply-email-subject": "$2 on $3", "flow-notification-reply-email-batch-body": "$1 {{GENDER:$1|responded}} to \"$2\" on \"$3\"", "flow-notification-reply-email-batch-bundle-body": "$1 and $4 {{PLURAL:$5|other|others}} {{GENDER:$1|responded}} to \"$2\" on \"$3\"", "flow-notification-mention-email-subject": "$1 {{GENDER:$1|mentioned}} {{GENDER:$3|you}} on \"$2\"", diff --git a/i18n/qqq.json b/i18n/qqq.json index ca33d6f..448637d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -226,7 +226,7 @@ "flow-notification-mention": "{{doc-singularthey}}\nNotification text for when a user is mentioned in another conversation. Parameters:\n* $1 - username of the person who made the post, can be used for GENDER\n* $2 - permalink to the post\n* $3 - title of the topic\n* $4 - title for the page that the Flow board is attached to\n* $5 - username of the person who receives the notification, can be used for GENDER\n{{Related|Flow-notification}}", "flow-notification-link-text-view-post": "Label for button that links to a flow post.", "flow-notification-link-text-view-topic": "Link text in for the view topic button in a notification", - "flow-notification-reply-email-subject": "Email notification subject when a user receives a reply. Parameters:\n* $1 - username of the person who replied\n{{Related|Flow-notification-email}}", + "flow-notification-reply-email-subject": "Email notification subject when a user receives a reply. Parameters:\n* $1 - username of the person who replied\n{{Related|Flow-notification-email\n* $2 - the topic title being replied to\n* $3 - title of the page the topic belongs to}}", "flow-notification-reply-email-batch-body": "Email notification body when a user receives a reply, this message is used in both single email and email digest.\n\nParameters:\n* $1 - username of the person who replied\n* $2 - title of the topic\n* $3 - title for the page that the Flow board is attached to\n{{Related|Flow-notification-email}}", "flow-notification-reply-email-batch-bundle-body": "Email notification body when a user receives reply from multiple users, this message is used in both single email and email digest.\n\nParameters:\n* $1 - username of the person who replied\n* $2 - title of the topic\n* $3 - title for the page that the Flow board is attached to\n* $4 - the count of other action performers, could be number or {{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $5 - a number used for plural support\n{{Related|Flow-notification-email}}", "flow-notification-mention-email-subject": "Email notification subject when a user is mentioned in a post. Parameters:\n* $1 - username of the person who mentions other users, can be used for GENDER\n* $2 - flow title text\n* $3 - username of the person who receives the notification, can be used for GENDER\n{{Related|Flow-notification-email}}", diff --git a/includes/Notifications/Notifications.php b/includes/Notifications/Notifications.php index 5b984c0..578d2e1 100644 --- a/includes/Notifications/Notifications.php +++ b/includes/Notifications/Notifications.php @@ -53,7 +53,7 @@ 'bundle-message' => 'flow-notification-reply-bundle', 'bundle-params' => array( 'agent', 'subject', 'title', 'post-permalink', 'agent-other-display', 'agent-other-count' ), 'email-subject-message' => 'flow-notification-reply-email-subject', - 'email-subject-params' => array( 'agent' ), + 'email-subject-params' => array( 'agent', 'subject', 'title' ), 'email-body-batch-message' => 'flow-notification-reply-email-batch-body', 'email-body-batch-params' => array( 'agent', 'subject', 'title' ), 'email-body-batch-bundle-message' => 'flow-notification-reply-email-batch-bundle-body', -- To view, visit https://gerrit.wikimedia.org/r/159864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fc06d81f17d4f54c5d5abfbdc5450d0becbef24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Bsitu <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
