jenkins-bot has submitted this change and it was merged.
Change subject: Remove incorrect usage of centralauth-editset-nowikis
......................................................................
Remove incorrect usage of centralauth-editset-nowikis
'centralauth-editset-nowikis' is defined twice in en.json and is
also incorrectly shown as an error message when the form field is empty.
Change-Id: I5487cd37112ebac45a9d7473cb3aae6be5dd39fb
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialWikiSets.php
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 89ffe03..983e497 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -323,10 +323,10 @@
"centralauth-editset-badname": "Invalid or empty set name.",
"centralauth-editset-badtype": "Invalid set type.",
"centralauth-editset-setexists": "Set with that name already exists.",
- "centralauth-editset-nowikis": "No wikis specified.",
+ "centralauth-editset-nowikis": "(none)",
+ "centralauth-editset-zerowikis": "No wikis specified.",
"centralauth-editset-grouplink":
"[[Special:GlobalGroupPermissions/$1|$1]]",
"centralauth-editset-nouse": "(none)",
- "centralauth-editset-nowikis": "(none)",
"centralauth-editset-usage": "Used in groups:",
"centralauth-editset-badwikis": "The following {{PLURAL:$2|wiki does
not|wikis do not}} exist: $1.",
"centralauth-editset-success": "The wiki set was updated.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 41d9869..339c169 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -339,7 +339,8 @@
"centralauth-editset-badname": "Used as error message.",
"centralauth-editset-badtype": "Used as error message.",
"centralauth-editset-setexists": "Used as error message.",
- "centralauth-editset-nowikis": "Used as error
message.\n{{Identical|None}}",
+ "centralauth-editset-nowikis": "Used on Special:WikiSets when there is
no wiki in a list\n{{Identical|None}}",
+ "centralauth-editset-zerowikis": "Used as error message on
Special:WikiSets.",
"centralauth-editset-grouplink": "{{optional}}\nUsed as list
item.\n\nThe list is preceded by
{{msg-mw|Centralauth-editset-usage}}.\n\nParameters:\n* $1 - group name",
"centralauth-editset-nouse": "Used if there are no usage.\n\nPreceded
by {{msg-mw|Centralauth-editset-usage}}.\n{{Identical|None}}",
"centralauth-editset-usage": "Used as label for usage.\n\nFollowed by
one of the following messages:\n* {{msg-mw|Centralauth-editset-grouplink}} -
list item\n* {{msg-mw|Centralauth-editset-nouse}} - if there are no usage",
diff --git a/includes/specials/SpecialWikiSets.php
b/includes/specials/SpecialWikiSets.php
index 8ab43e2..78090bd 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -306,7 +306,7 @@
return;
}
if ( !$wikis ) {
- $this->buildSetView( $id, $this->msg(
'centralauth-editset-nowikis' )->escaped(), $name, $type, $wikis, $reason );
+ $this->buildSetView( $id, $this->msg(
'centralauth-editset-zerowikis' )->escaped(), $name, $type, $wikis, $reason );
return;
}
$badwikis = array();
--
To view, visit https://gerrit.wikimedia.org/r/278568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5487cd37112ebac45a9d7473cb3aae6be5dd39fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
