jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358963 )
Change subject: Reword Echo notification text
......................................................................
Reword Echo notification text
Bug: T164375
Change-Id: I1e939765b2c3f5c4cccc76ff506f0aeb7b5cb01f
---
M client/i18n/en.json
M client/i18n/qqq.json
M client/includes/Hooks/EchoNotificationsHandlers.php
M client/includes/Notifications/PageConnectionPresentationModel.php
4 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
WMDE-leszek: Checked; Looks good to me, approved
Jonas Kress (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/client/i18n/en.json b/client/i18n/en.json
index 8e341d2..8d25ec6 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -125,7 +125,7 @@
"wikibase-otherprojects-beta-description": "Adds an
\"{{int:wikibase-otherprojects}}\" section to the sidebar that provides links
to the other Wikimedia projects based on {{WBREPONAME}} data.",
"echo-category-title-wikibase-action":
"{{PLURAL:$1|Connection|Connections}} with {{WBREPONAME}}",
"echo-pref-tooltip-wikibase-action": "Notify me when someone connects a
page {{GENDER:|I created}} to a {{WBREPONAME}} item.",
- "notification-header-page-connection": "The page <strong>$3</strong>
was {{GENDER:$2|connected}} to a {{WBREPONAME}} item.",
+ "notification-header-page-connection": "The page <strong>$3</strong>
was {{GENDER:$2|connected}} to {{PLURAL:$4|-1=a {{WBREPONAME}} item|the
{{WBREPONAME}} item $4}}, which contains data relevant to the topic.",
"notification-bundle-header-page-connection": "<strong>$3</strong> and
{{PLURAL:$4|one other page|$4 other pages|100=99+ other pages}} were
{{GENDER:$2|connected}} to {{WBREPONAME}} items.",
"notification-link-text-view-item": "{{GENDER:$1|View}} item",
"notification-subject-page-connection": "A page on {{SITENAME}} you
{{GENDER:$3|created}} was {{GENDER:$2|connected}} to a {{WBREPONAME}} item",
diff --git a/client/i18n/qqq.json b/client/i18n/qqq.json
index 16e69c2..4c5acc9 100644
--- a/client/i18n/qqq.json
+++ b/client/i18n/qqq.json
@@ -136,7 +136,7 @@
"wikibase-otherprojects-beta-description": "Description for the \"other
projects\" beta feature.\n\nThis description is for the checkbox label
{{msg-mw|wikibase-otherprojects-beta-label}}.\n\nRefers to
{{msg-mw|Wikibase-otherprojects}}.\n{{related|Wikibase-otherprojects}}",
"echo-category-title-wikibase-action": "This is a short title for
notification category.\n\nUsed in a list of options under the heading
{{msg-mw|Prefs-echosubscriptions}} in Special:Preferences.\n\nParameters:\n* $1
- number of messages, for PLURAL support\n{{Related|Echo-category-title}}",
"echo-pref-tooltip-wikibase-action": "This is a short description of
the wikibase-action notification category.\n{{Related|Echo-pref-tooltip}}",
- "notification-header-page-connection": "Header text for a notification
when your article is connected to a Wikibase repository. Parameters:\n* $1 –
formatted username of the person who connected the page\n* $2 – raw username of
the person who connected the page, can be used for GENDER\n* $3 – title of the
page that was connected\nSee also:\n*
{{msg-mw|Notification-subject-page-connection}}\n*
{{msg-mw|Notification-header-page-linked}}",
+ "notification-header-page-connection": "Header text for a notification
when your article is connected to a Wikibase repository. Parameters:\n* $1 –
formatted username of the person who connected the page\n* $2 – raw username of
the person who connected the page, can be used for GENDER\n* $3 – title of the
page that was connected\n* $4 – ID of the item the article is now connected to
(or -1 on old notifications that did not specify the item)\nSee also:\n*
{{msg-mw|Notification-subject-page-connection}}\n*
{{msg-mw|Notification-header-page-linked}}",
"notification-bundle-header-page-connection": "Bundled message for the
page connection notification. Parameters:\n* $1 – formatted username of the
person who connected the first page\n* $2 – raw username of the person who
connected the first page, for GENDER support\n* $3 – title of the first page
that was connected\n* $4 – the number of other pages that were connected,
except that if the count is greater than 99, this value will be 100; uses
standard number formatting and used for PLURAL\nSee also:\n*
{{msg-mw|Notification-header-page-connection}}\n*
{{msg-mw|Notification-bundle-header-page-linked}}\n{{Related|Notification-bundle}}",
"notification-link-text-view-item": "Label for button that links to the
item your article was connected to. Parameters:\n* $1 – raw username of the
person who is viewing the notification, can be used for GENDER\nSee also:\n*
{{msg-mw|Notification-link-text-view-page}}",
"notification-subject-page-connection": "Email subject. Parameters:\n*
$1 – formatted username of the person who connected the page\n* $2 – raw
username of the person who connected the page, can be used for GENDER.\n* $3 –
raw username of the notified user, can be used for GENDER\nSee also:\n*
{{msg-mw|Notification-header-page-connection}}\n*
{{msg-mw|Notification-page-linked-email-subject}}",
diff --git a/client/includes/Hooks/EchoNotificationsHandlers.php
b/client/includes/Hooks/EchoNotificationsHandlers.php
index 3c0ff36..34f9370 100644
--- a/client/includes/Hooks/EchoNotificationsHandlers.php
+++ b/client/includes/Hooks/EchoNotificationsHandlers.php
@@ -234,6 +234,7 @@
// maybe also a diff link?
'url' =>
$this->repoLinker->getEntityUrl( $entityId ),
'repoSiteName' => $this->repoSiteName,
+ 'entity' =>
$entityId->getSerialization(),
],
'title' => $title,
'type' => self::NOTIFICATION_TYPE
diff --git a/client/includes/Notifications/PageConnectionPresentationModel.php
b/client/includes/Notifications/PageConnectionPresentationModel.php
index a3c15f4..78f990a 100644
--- a/client/includes/Notifications/PageConnectionPresentationModel.php
+++ b/client/includes/Notifications/PageConnectionPresentationModel.php
@@ -61,7 +61,9 @@
->numParams( $count );
} else {
$msg = $this->getMessageWithAgent(
"notification-header-{$this->type}" )
- ->params( $truncated );
+ ->params( $truncated )
+ // Old events did not had this parameter.
Default to -1 for the PLURAL function.
+ ->params( $this->event->getExtraParam(
'entity', -1 ) );
}
return $msg;
--
To view, visit https://gerrit.wikimedia.org/r/358963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e939765b2c3f5c4cccc76ff506f0aeb7b5cb01f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
