jenkins-bot has submitted this change and it was merged.
Change subject: Remove dead code dealing with 'unknown' language
......................................................................
Remove dead code dealing with 'unknown' language
This looks like it was meant to handle the case where the wiki had no
language templates defined, and thus config.uwLanguages is empty.
However, other code already badly fails with exceptions in that case.
If we want to support this, we should just not show a dropdown at all.
Change-Id: Ida3567c38717e30afc15a0eebb1daabca863d8ae
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
M resources/mw.LanguageUpWiz.js
M resources/mw.UploadWizardDetails.js
5 files changed, 4 insertions(+), 25 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 0635e19..13ef388 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -117,7 +117,6 @@
'uploadwizard',
'uploadwizard-desc',
'mwe-upwiz-js-off',
- 'mwe-upwiz-code-unknown',
'mwe-upwiz-step-tutorial',
'mwe-upwiz-step-file',
'mwe-upwiz-step-deeds',
diff --git a/i18n/en.json b/i18n/en.json
index 7715c28..7e5db3b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -19,7 +19,6 @@
"group-upwizcampeditors.js": "/* JS placed here will affect upload
wizard campaign editors only */",
"mwe-upwiz-js-off": "UploadWizard uses JavaScript for an improved
interface. Your browser either does not support JavaScript or has JavaScript
turned off, so we are showing you a simple upload form.",
"mwe-upwiz-extension-disabled": "This page has been disabled due to
temporary technical problems. In the meantime try the standard upload form.",
- "mwe-upwiz-code-unknown": "Unknown language",
"mwe-upwiz-step-tutorial": "Learn",
"mwe-upwiz-step-file": "Upload",
"mwe-upwiz-step-deeds": "Release rights",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1900e9e..06583b5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -42,7 +42,6 @@
"group-upwizcampeditors.js": "{{doc-group|upwizcampeditors|js}}",
"mwe-upwiz-js-off": "Shown in a noscript tag if the user visits
Special:UploadWizard and has JavaScript turned off.",
"mwe-upwiz-extension-disabled": "Shown if the UploadWizard page has
been disabled.",
- "mwe-upwiz-code-unknown": "Used as an option in the Language select
box.",
"mwe-upwiz-step-tutorial": "{| align=\"right\"\n|
[[file:commons-uw-L524.png|Initial \"{{MediaWiki:mwe-upwiz-step-file/en}}\"
page|thumb|right]]\n| [[file:commons-uw-L521.png|Beginning of
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n|
[[file:commons-uw-L522.png|Center of
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n|
[[file:commons-uw-L523.png|End of \"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\"
page|thumb|right]]\n|} This is a short greyed or bolded label, in the top bar
of all pages of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
"mwe-upwiz-step-file": "{| align=\"right\"\n|
[[file:commons-uw-L524.png|Initial \"{{MediaWiki:mwe-upwiz-step-file/en}}\"
page|thumb|right]]\n| [[file:commons-uw-L521.png|Beginning of
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n|} This is a
short greyed or bolded label, in the top bar of all pages of the
[[:mw:Extension:UploadWizard|MediaWiki Upload
Wizard]].\n----\n{{Identical|Upload}}",
"mwe-upwiz-step-deeds": "{| align=\"right\"\n|
[[file:commons-uw-L524.png|Initial \"{{MediaWiki:mwe-upwiz-step-file/en}}\"
page|thumb|right]]\n| [[file:commons-uw-L529.png|Initial
\"{{MediaWiki:mwe-upwiz-step-deeds/en}}\" page|thumb|right]]\n|} This is a
short greyed or bolded label, in the top bar of all pages of the
[[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
diff --git a/resources/mw.LanguageUpWiz.js b/resources/mw.LanguageUpWiz.js
index 7b9c4b6..1c382df 100644
--- a/resources/mw.LanguageUpWiz.js
+++ b/resources/mw.LanguageUpWiz.js
@@ -10,8 +10,6 @@
initialized: false,
- UNKNOWN: 'unknown',
-
/**
* List of default languages
* Make sure you have language templates set up for each of
these on your wiki, e.g. {{en}}
@@ -86,7 +84,7 @@
* Get an HTML select menu of all our languages.
*
* @param {string} name Desired name of select element
- * @param {string} code Selected language code
+ * @param {string} [code] Selected language code
* @return {HTMLSelectElement} The `select` element configured
as desired
*/
getMenu: function ( name, code ) {
@@ -94,7 +92,7 @@
mw.LanguageUpWiz.initialize();
/* If we did not request a specific selected language
code, see if we have a default. */
- if ( mw.LanguageUpWiz.defaultCode !== null && code ===
mw.LanguageUpWiz.UNKNOWN ) {
+ if ( !code ) {
code = mw.LanguageUpWiz.defaultCode;
}
@@ -102,19 +100,8 @@
.clone()
.prop( 'name', name );
- if ( code === mw.LanguageUpWiz.UNKNOWN ) {
- // n.b. MediaWiki LanguageHandler has ability
to add custom label for 'Unknown'; possibly as pseudo-label
- $select
- .prepend(
- $( '<option>' )
- .prop( 'value',
mw.LanguageUpWiz.UNKNOWN )
- .text( mw.message(
'mwe-upwiz-code-unknown' ).text() )
- )
- .val( mw.LanguageUpWiz.UNKNOWN );
- }
-
/* Pre select the 'code' language */
- if ( code !== undefined &&
mw.LanguageUpWiz.checkForLang( code ) ) {
+ if ( mw.LanguageUpWiz.checkForLang( code ) ) {
$select.val( mw.LanguageUpWiz.getClosest( code
) );
}
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 2db8530..5ee5b8a 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -384,7 +384,7 @@
mw.UploadWizard.config.fields.length &&
mw.UploadWizard.config.fields[ 0 ].wikitext
),
- mw.LanguageUpWiz.UNKNOWN,
+ undefined,
false,
mw.UploadWizard.config.defaults.description
);
@@ -1092,11 +1092,6 @@
if ( required === undefined ) {
required = false;
}
-
- if ( languageCode === undefined ) {
- languageCode = mw.LanguageUpWiz.UNKNOWN;
- }
-
if ( allowRemove === undefined ) {
allowRemove = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/250424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida3567c38717e30afc15a0eebb1daabca863d8ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: MarkTraceur <[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
