Ljonka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280657
Change subject: ShoutBox: correct message key for mail
......................................................................
ShoutBox: correct message key for mail
notify params adjust for changed message
Change-Id: I5b4e820b37831551b1ebec6bded58dff0534c57e
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/i18n/en.json
M ShoutBox/i18n/qqq.json
3 files changed, 6 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/57/280657/1
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 9a5092d..16b9f60 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -103,8 +103,8 @@
array( 'agent', 'title', 'titlelink' ),
'bs-shoutbox-notifications-title-message-subject',
array(),
- 'bs-shoutbox-notifications-summary',
- array( 'agent', 'title', 'titlelink' )
+ 'bs-shoutbox-notifications-title-message-text',
+ array( 'agent', 'title', 'titlelink', 'agentprofile' )
);
wfProfileOut( 'BS::' . __METHOD__ );
}
@@ -376,7 +376,8 @@
array(
'mentioned-user-id' => $oUser->getId(),
'realname' => $sCurrentUserName,
- 'title' => $sTitleText
+ 'title' => $sTitleText,
+ 'agentprofile' =>
$oCurrentUser->getUserPage()->getFullURL(),
)
);
}
diff --git a/ShoutBox/i18n/en.json b/ShoutBox/i18n/en.json
index 67c7857..6cc710f 100644
--- a/ShoutBox/i18n/en.json
+++ b/ShoutBox/i18n/en.json
@@ -30,6 +30,6 @@
"bs-shoutbox-n-shouts": "$1 {{PLURAL:$1|Shout|Shouts}}",
"echo-category-title-bs-shoutbox-mention-cat": "Notification for
mention in a shout",
"bs-shoutbox-notifications-title-message-subject": "You've been
mentioned",
- "bs-shoutbox-notifications-title-message-text": "You've been
{{GENDER:$1|mentioned}} by $4 in a shout on the page \"$5.\"\n\nYou can visit
the page following this link:\n$3.\n",
+ "bs-shoutbox-notifications-title-message-text": "You've been
{{GENDER:$1|mentioned}} by $1 ($4) in a shout on the page \"$2.\"\n\nYou can
visit the page following this link:\n$3\n",
"bs-shoutbox-notifications-summary": "[[User:$1|$1]]
{{GENDER:$1|mentioned}} you in a shout on $3."
}
diff --git a/ShoutBox/i18n/qqq.json b/ShoutBox/i18n/qqq.json
index 40c70a6..cfe0daf 100644
--- a/ShoutBox/i18n/qqq.json
+++ b/ShoutBox/i18n/qqq.json
@@ -34,7 +34,7 @@
"bs-shoutbox-n-shouts": "Text for the number of shouts, used in
StateBar\n*$1 is the number of shouts, also use this for PLURAL
distinction\n{{Identical|Shout}}",
"echo-category-title-bs-shoutbox-mention-cat": "text found in
notifications, let's the user decide if he wants to be notified about a mention
in a message in the shoutbox via web, mail or both",
"bs-shoutbox-notifications-title-message-subject": "notifications text
used for e-mail if the user was mentioned in a shoutbox entry",
- "bs-shoutbox-notifications-title-message-text": "text used in
notifications in the wiki and as the mail body if the user was mentioned in a
shoutbox entry\n\nParameters:\n*$1 the user who mentioned \n*$2 is the link to
the user page of the user that mentioned another user. (unused) \n*$3 is the
link to the page where the shoutbox entry was made.\n*$4 is the real name of
the user who mentioned.\n*$5 is the title of the page where the shoutbox entry
was made.",
+ "bs-shoutbox-notifications-title-message-text": "text used in
notifications in the wiki and as the mail body if the user was mentioned in a
shoutbox entry\n\nParameters:\n*$1 is the username of the user who mentioned
\n*$2 is the page title where shoutbox entry was made. $3 is the link to the
page where the shoutbox entry was made.\n*$4 is the link to profile of the user
who mentioned.",
"bs-shoutbox-notifications-summary": "Text used in notifications about
the mentioning of an user in a shoutbox message.\n\nParameters:\n*$1 the user
who mentioned \n*$2 is the link to the user page of the user that mentioned
another user. (unused) \n*$3 is the link to the page where the shoutbox entry
was made.\n*$4 is the real name of the user who mentioned. (unused)\n*$5 is the
title of the page where the shoutbox entry was made. (unused)",
"apihelp-bs-shoutbox-description": "Describes the API endpoint that
provides tasks for the ShoutBox extension"
}
--
To view, visit https://gerrit.wikimedia.org/r/280657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4e820b37831551b1ebec6bded58dff0534c57e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Ljonka <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
