[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.28.0-wmf.14]: Revert "Allow self mentions"
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Allow self mentions"
..
Revert "Allow self mentions"
This reverts commit 0e234631853acdc9c9626ad82954762ac8806df0.
Change-Id: I4389c7b93b2bbc117931a263b58a8f1cc30dca6c
(cherry picked from commit 59568789fa695d2cff0577609aa6080fe4804208)
---
M i18n/en.json
M i18n/qqq.json
M includes/DiscussionParser.php
M includes/formatters/EventPresentationModel.php
M includes/formatters/MentionPresentationModel.php
M tests/phpunit/DiscussionParserTest.php
6 files changed, 12 insertions(+), 31 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 658cd3d..1342f80 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,8 +141,6 @@
"notification-body-mention": "$1",
"notification-header-mention-other": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$3|you}} on $4 in \"$5\".",
"notification-header-mention-other-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on $4.",
- "notification-header-mention-self": "{{GENDER:$1|You}}
{{GENDER:$1|mentioned}} {{GENDER:$1|yourself}} on $2 in
\"$3\".",
- "notification-header-mention-self-nosection": "{{GENDER:$1|You}}
{{GENDER:$1|mentioned}} {{GENDER:$1|yourself}} on $2.",
"notification-header-mention-user-talkpage-v2": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page
{{GENDER:$5|of}} $4 in \"$6\".",
"notification-header-mention-user-talkpage-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page
{{GENDER:$5|of}} $4.",
"notification-header-mention-agent-talkpage": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on
{{GENDER:$2|his|her|their}} talk page in
\"$4\".",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5a33cad..ec987ae 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -134,8 +134,6 @@
"notification-body-mention": "{{notranslate}}",
"notification-header-mention-other": "Header text for a notification
when you are mentioned by another user in a section on a page that is not an
article talk page or a user talk page.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the page they
were mentioned in (with namespace).\n* $5 - name of the section they were
mentioned in",
"notification-header-mention-other-nosection": "Header text for a
notification when you are mentioned by another user on a page that is not an
article talk page or a user talk page.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the page they
were mentioned in (with namespace)",
- "notification-header-mention-self": "Header text for a notification
when you mention yourself in a section.\n* $1 - user's name.\n* $2 - name of
the page they were mentioned in (with namespace).\n* $3 - name of the section
they were mentioned in",
- "notification-header-mention-self-nosection": "Header text for a
notification when you mention yourself.\n* $1 - user's name.\n* $2 - name of
the page they were mentioned in (with namespace)",
"notification-header-mention-user-talkpage-v2": "Header text for a
notification when you are mentioned by another user in a section on a user talk
page.\n* $1 - user's name (not suitable for GENDER).\n* $2 - user's name for
use in GENDER.\n* $3 - name of the user viewing the notification, can be used
for GENDER\n* $4 - formatted name of the user whose talk page you are mentioned
in.\n* $5 - name of the user whose talk page you are mentioned in, can be used
for GENDER\n* $6 - name of the section they were mentioned in",
"notification-header-mention-user-talkpage-nosection": "Header text for
a notification when you are mentioned by another user on a user talk page.\n*
$1 - user's name (not suitable for GENDER).\n* $2 - user's name for use in
GENDER.\n* $3 - name of the user viewing the notification, can be used for
GENDER\n* $4 - name of the user whose talk page you are mentioned in\n* $5 -
name of the user whose talk page you are mentioned in, can be used for GENDER",
"notification-header-mention-agent-talkpage":
"{{doc-singularthey}}\nHeader text for a notification when you are mentioned by
another user in a section on their talk page.\n* $1 - user's name (not suitable
for GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the section
they were mentioned in",
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 5dc08a0..67f2fc1 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -1
[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.28.0-wmf.14]: Revert "Allow self mentions"
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304427
Change subject: Revert "Allow self mentions"
..
Revert "Allow self mentions"
This reverts commit 0e234631853acdc9c9626ad82954762ac8806df0.
Change-Id: I4389c7b93b2bbc117931a263b58a8f1cc30dca6c
(cherry picked from commit 59568789fa695d2cff0577609aa6080fe4804208)
---
M i18n/en.json
M i18n/qqq.json
M includes/DiscussionParser.php
M includes/formatters/EventPresentationModel.php
M includes/formatters/MentionPresentationModel.php
M tests/phpunit/DiscussionParserTest.php
6 files changed, 12 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/27/304427/1
diff --git a/i18n/en.json b/i18n/en.json
index 658cd3d..1342f80 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,8 +141,6 @@
"notification-body-mention": "$1",
"notification-header-mention-other": "$1 {{GENDER:$2|mentioned}}
{{GENDER:$3|you}} on $4 in \"$5\".",
"notification-header-mention-other-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on $4.",
- "notification-header-mention-self": "{{GENDER:$1|You}}
{{GENDER:$1|mentioned}} {{GENDER:$1|yourself}} on $2 in
\"$3\".",
- "notification-header-mention-self-nosection": "{{GENDER:$1|You}}
{{GENDER:$1|mentioned}} {{GENDER:$1|yourself}} on $2.",
"notification-header-mention-user-talkpage-v2": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page
{{GENDER:$5|of}} $4 in \"$6\".",
"notification-header-mention-user-talkpage-nosection": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the user talk page
{{GENDER:$5|of}} $4.",
"notification-header-mention-agent-talkpage": "$1
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on
{{GENDER:$2|his|her|their}} talk page in
\"$4\".",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5a33cad..ec987ae 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -134,8 +134,6 @@
"notification-body-mention": "{{notranslate}}",
"notification-header-mention-other": "Header text for a notification
when you are mentioned by another user in a section on a page that is not an
article talk page or a user talk page.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the page they
were mentioned in (with namespace).\n* $5 - name of the section they were
mentioned in",
"notification-header-mention-other-nosection": "Header text for a
notification when you are mentioned by another user on a page that is not an
article talk page or a user talk page.\n* $1 - user's name (not suitable for
GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the page they
were mentioned in (with namespace)",
- "notification-header-mention-self": "Header text for a notification
when you mention yourself in a section.\n* $1 - user's name.\n* $2 - name of
the page they were mentioned in (with namespace).\n* $3 - name of the section
they were mentioned in",
- "notification-header-mention-self-nosection": "Header text for a
notification when you mention yourself.\n* $1 - user's name.\n* $2 - name of
the page they were mentioned in (with namespace)",
"notification-header-mention-user-talkpage-v2": "Header text for a
notification when you are mentioned by another user in a section on a user talk
page.\n* $1 - user's name (not suitable for GENDER).\n* $2 - user's name for
use in GENDER.\n* $3 - name of the user viewing the notification, can be used
for GENDER\n* $4 - formatted name of the user whose talk page you are mentioned
in.\n* $5 - name of the user whose talk page you are mentioned in, can be used
for GENDER\n* $6 - name of the section they were mentioned in",
"notification-header-mention-user-talkpage-nosection": "Header text for
a notification when you are mentioned by another user on a user talk page.\n*
$1 - user's name (not suitable for GENDER).\n* $2 - user's name for use in
GENDER.\n* $3 - name of the user viewing the notification, can be used for
GENDER\n* $4 - name of the user whose talk page you are mentioned in\n* $5 -
name of the user whose talk page you are mentioned in, can be used for GENDER",
"notification-header-mention-agent-talkpage":
"{{doc-singularthey}}\nHeader text for a notification when you are mentioned by
another user in a section on their talk page.\n* $1 - user's name (not suitable
for GENDER).\n* $2 - user's name for use in GENDER.\n* $3 - name of the user
viewing the notification, can be used for GENDER\n* $4 - name of the section
they were mentioned in",
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 5dc08a0..67f2fc1 100644
--- a/includes/DiscussionP
