jenkins-bot has submitted this change and it was merged.
Change subject: Handle entirely numeric newsletter names correctly.
......................................................................
Handle entirely numeric newsletter names correctly.
Bug: T110671
Change-Id: Id21e0d8e4a759d4a77ec550b82c86bae6f117315
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletterManage.php
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 99dc021..2a52aa5 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,5 +57,6 @@
"newsletter-manage-header-permissions": "Permissions",
"newsletter-manage-header-action": "Action",
"newsletter-owner-radiobutton-label": "Owner",
- "newsletter-publisher-radiobutton-label": "Publisher"
+ "newsletter-publisher-radiobutton-label": "Publisher",
+ "newsletter-dropdown-default-message": "Please select one"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3215dc5..d05c9c0 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -58,5 +58,6 @@
"newsletter-manage-header-permissions": "Label of the third column of
table in [[Special:NewsletterManage]] which lists the roles of a
user\n{{Identical|Permission}}",
"newsletter-manage-header-action": "{{Identical|Action}}",
"newsletter-owner-radiobutton-label": "Label of radio button in
'Permissions' column in [[Special:NewsletterManage]] which is checked if the
user is the owner of the newsletter\n{{Identical|Owner}}",
- "newsletter-publisher-radiobutton-label": "Label of radio button in
'Permissions' column in [[Special:NewsletterManage]] which is checked if the
user is a publisher of the newsletter\n{{Identical|Publisher}}"
+ "newsletter-publisher-radiobutton-label": "Label of radio button in
'Permissions' column in [[Special:NewsletterManage]] which is checked if the
user is a publisher of the newsletter\n{{Identical|Publisher}}",
+ "newsletter-dropdown-default-message": "Default option of drop down
menus to select newsletters in [[Special:NewsletterManage]]"
}
diff --git a/includes/specials/SpecialNewsletterManage.php
b/includes/specials/SpecialNewsletterManage.php
index f95eae8..a919701 100644
--- a/includes/specials/SpecialNewsletterManage.php
+++ b/includes/specials/SpecialNewsletterManage.php
@@ -64,7 +64,7 @@
'type' => 'select',
'section' => 'announceissue-section',
'label-message' => 'newsletter-name',
- 'options' => array_merge( array( '' => null ),
$newsletterNameMap ),
+ 'options' => array( $this->msg(
'newsletter-dropdown-default-message' )->text() => null ) + $newsletterNameMap,
),
'issue-page' => array(
'type' => 'text',
@@ -97,7 +97,7 @@
'type' => 'select',
'section' => 'addpublisher-section',
'label-message' => 'newsletter-name',
- 'options' => array_merge( array( '' => null ),
$ownedNewsletterMap ),
+ 'options' => array( $this->msg(
'newsletter-dropdown-default-message' )->text() => null ) + $ownedNewsletterMap,
),
'publisher-name' => array(
'section' => 'addpublisher-section',
--
To view, visit https://gerrit.wikimedia.org/r/235275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id21e0d8e4a759d4a77ec550b82c86bae6f117315
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Tinaj1234 <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Glaisher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
