jenkins-bot has submitted this change and it was merged.
Change subject: Remove 'View Board' from all Flow notifications
......................................................................
Remove 'View Board' from all Flow notifications
Add linking to 'new topic' back since the primary link
wouldn't work in all notification page
Change-Id: I4bb7349fea2d8675cd4db9b39c390c2ba4f6fc9a
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/Formatter.php
M includes/Notifications/Notifications.php
4 files changed, 1 insertion(+), 29 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 4f49c8d..2878e13 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -220,11 +220,10 @@
"flow-notification-reply-bundle": "<span class=\"plainlinks
mw-echo-title-heading\">[$4 $2]</span><br />$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|responded}} on '''$3'''.",
"flow-notification-edit": "$1 {{GENDER:$1|edited}} a <span
class=\"plainlinks\">[$5 post]</span> in \"$2\" on [[$3|$4]].",
"flow-notification-edit-bundle": "$1 and $5 {{PLURAL:$6|other|others}}
{{GENDER:$1|edited}} a <span class=\"plainlinks\">[$4 post]</span> in \"$2\" on
\"$3\".",
- "flow-notification-newtopic": "$1 {{GENDER:$1|created}} a new topic on
'''$3'''.",
+ "flow-notification-newtopic": "$1 {{GENDER:$1|created}} a <span
class=\"plainlinks\">[$5 new topic]</span> on '''$3'''.",
"flow-notification-rename": "$1 {{GENDER:$1|changed}} the title of <span
class=\"plainlinks\">[$2 $3]</span> to \"$4\" on [[$5|$6]].",
"flow-notification-mention": "$1 {{GENDER:$1|mentioned}} 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-board": "View board",
"flow-notification-link-text-view-topic": "View topic",
"flow-notification-reply-email-subject": "$1 {{GENDER:$1|responded}} to a
topic",
"flow-notification-reply-email-batch-body": "$1 {{GENDER:$1|responded}} to
\"$2\" on \"$3\"",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index af9205c..cf5e6aa 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -228,7 +228,6 @@
"flow-notification-rename": "Notification text for when the subject of
a topic is changed. Parameters:\n* $1 - username of the person who edited the
title, can be used for GENDER\n* $2 - permalink to the topic\n* $3 - old topic
subject\n* $4 - new topic subject\n* $5 - title for the Flow board\n* $6 -
title for the page that the Flow board is attached
to\n{{Related|Flow-notification}}",
"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{{Related|Flow-notification}}",
"flow-notification-link-text-view-post": "Label for button that links
to a flow post.",
- "flow-notification-link-text-view-board": "Label for button that links
to a flow discussion board.",
"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-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}}",
diff --git a/includes/Notifications/Formatter.php
b/includes/Notifications/Formatter.php
index b7be3fa..a0f1be9 100644
--- a/includes/Notifications/Formatter.php
+++ b/includes/Notifications/Formatter.php
@@ -120,12 +120,6 @@
$anchor = $this->getPostLinkAnchor( $event,
$user );
break;
- case 'flow-board':
- if ( $title ) {
- $anchor = $urlGenerator->boardLink(
$title );
- }
- break;
-
case 'flow-topic':
$workflowId = $event->getExtraParam(
'topic-workflow' );
// Get topic title
diff --git a/includes/Notifications/Notifications.php
b/includes/Notifications/Notifications.php
index 82fb936..66e6138 100644
--- a/includes/Notifications/Notifications.php
+++ b/includes/Notifications/Notifications.php
@@ -18,10 +18,6 @@
'message' => 'flow-notification-link-text-view-topic',
'destination' => 'flow-topic'
),
- 'secondary-link' => array(
- 'message' => 'flow-notification-link-text-view-board',
- 'destination' => 'flow-board'
- ),
'title-message' => 'flow-notification-newtopic',
'title-params' => array( 'agent', 'flow-title', 'title',
'subject', 'topic-permalink' ),
'email-subject-message' =>
'flow-notification-newtopic-email-subject',
@@ -36,10 +32,6 @@
'primary-link' => array(
'message' => 'flow-notification-link-text-view-post',
'destination' => 'flow-post'
- ),
- 'secondary-link' => array(
- 'message' => 'flow-notification-link-text-view-board',
- 'destination' => 'flow-board'
),
'title-message' => 'flow-notification-reply',
'title-params' => array( 'agent', 'subject', 'flow-title',
'title', 'post-permalink' ),
@@ -61,10 +53,6 @@
'message' => 'flow-notification-link-text-view-post',
'destination' => 'flow-post'
),
- 'secondary-link' => array(
- 'message' => 'flow-notification-link-text-view-board',
- 'destination' => 'flow-board'
- ),
'title-message' => 'flow-notification-edit',
'title-params' => array( 'agent', 'subject', 'flow-title',
'title', 'post-permalink' ),
'bundle' => array(
@@ -85,10 +73,6 @@
'message' => 'flow-notification-link-text-view-post',
'destination' => 'flow-post'
),
- 'secondary-link' => array(
- 'message' => 'flow-notification-link-text-view-board',
- 'destination' => 'flow-board'
- ),
'title-message' => 'flow-notification-rename',
'title-params' => array( 'agent', 'topic-permalink',
'old-subject', 'new-subject', 'flow-title', 'title' ),
'email-subject-message' =>
'flow-notification-rename-email-subject',
@@ -100,10 +84,6 @@
'primary-link' => array(
'message' => 'notification-link-text-view-mention',
'destination' => 'flow-post'
- ),
- 'secondary-link' => array(
- 'message' => 'flow-notification-link-text-view-board',
- 'destination' => 'flow-board'
),
'category' => 'mention',
'title-message' => 'flow-notification-mention',
--
To view, visit https://gerrit.wikimedia.org/r/155653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bb7349fea2d8675cd4db9b39c390c2ba4f6fc9a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
