jenkins-bot has submitted this change and it was merged.
Change subject: Use HTMLComboboxField on Special:OAuthConsumerRegistration
......................................................................
Use HTMLComboboxField on Special:OAuthConsumerRegistration
Requires I954d3d24ed4e in mediawiki/core.
Bug: T118120
Change-Id: I7e6277ff30f25a0f23bd17a567f6f23089cc4caa
---
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index c47f828..a6e2785 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -134,13 +134,11 @@
'required' => true
),
'wiki' => array(
- 'type' => $allWikis ?
'autocompleteselect' : 'select',
+ 'type' => $allWikis ?
'combobox' : 'select',
'options' => array(
wfMessage(
'mwoauth-consumer-allwikis' )->escaped() => '*',
wfMessage(
'mwoauth-consumer-wiki-thiswiki', wfWikiID() )->escaped() => wfWikiID()
- ),
- 'autocomplete' => array_flip(
$allWikis ),
- 'other' => wfMessage(
'mwoauth-consumer-wiki-other' )->escaped(),
+ ) + array_flip( $allWikis ),
'label-message' =>
'mwoauth-consumer-wiki',
'required' => true,
'default' => '*'
diff --git a/i18n/en.json b/i18n/en.json
index 0d472c5..28856b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -31,7 +31,6 @@
"mwoauth-consumer-required-grant": "Applicable to consumer",
"mwoauth-consumer-wiki": "Applicable project:",
"mwoauth-consumer-wiki-thiswiki": "Current project ($1)",
- "mwoauth-consumer-wiki-other": "Specific project",
"mwoauth-consumer-restrictions": "Usage restrictions:",
"mwoauth-consumer-restrictions-json": "Usage restrictions (JSON):",
"mwoauth-consumer-rsakey": "Public RSA key:",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7b0c9b7..b6f4b85 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -39,7 +39,6 @@
"mwoauth-consumer-required-grant": "Used as table column header.",
"mwoauth-consumer-wiki": "Used as label for the input box. The default
value for the input box is \"*\".\n{{Identical|Applicable project}}",
"mwoauth-consumer-wiki-thiswiki": "Label for selection-list option,
indicating the wiki this user is currently visiting.\n\nParameters:\n* $1 -
wiki ID",
- "mwoauth-consumer-wiki-other": "Label for selection-list option,
indicating the user wants to type in another wiki's name",
"mwoauth-consumer-restrictions": "Used as label for the textarea. (The
value is written in JSON format.)\n\nFollowed by the textarea or the message
{{msg-mw|Mwoauthmanageconsumers-field-hidden}}.\n{{Identical|Usage
restriction}}",
"mwoauth-consumer-restrictions-json": "Used as label for the
\"Restrictions\" textarea.\n{{Identical|Usage restriction}}",
"mwoauth-consumer-rsakey": "Used as label for the textarea.\n\nFollowed
by the textarea or the message {{msg-mw|Mwoauthmanageconsumers-field-hidden}}.",
--
To view, visit https://gerrit.wikimedia.org/r/251825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e6277ff30f25a0f23bd17a567f6f23089cc4caa
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Jforrester <[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
