jenkins-bot has submitted this change and it was merged.
Change subject: Avoid references to jquery.uls RL module from ext.uls.init
......................................................................
Avoid references to jquery.uls RL module from ext.uls.init
Checks to see if language is supported can be also done using
jquery.uls.data
Bug: T135210
Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
---
M resources/js/ext.uls.init.js
1 file changed, 3 insertions(+), 16 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 40ef11f..6cf4eee 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -20,8 +20,6 @@
( function ( $, mw ) {
'use strict';
- var hasOwn = Object.prototype.hasOwnProperty;
-
mw.uls = mw.uls || {};
mw.uls.previousLanguagesStorageKey = 'uls-previous-languages';
mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings',
'ext.uls.displaysettings' ];
@@ -152,21 +150,10 @@
// Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode ) {
- var target;
-
- // If the language is already known and defined, just
use it
- if ( hasOwn.call( $.fn.uls.defaults.languages, langCode
) ) {
+ // If the language is already known and defined, just
use it.
+ // $.uls.data.getAutonym will resolve redirects if any.
+ if ( $.uls.data.getAutonym( langCode ) !== langCode ) {
return true;
- }
-
- // If the language is not immediately known,
- // try to check is as a redirect
- target = $.uls.data.isRedirect( langCode );
-
- if ( target ) {
- // Check that the redirect's target is known
- // to this instance of ULS
- return hasOwn.call(
$.fn.uls.defaults.languages, target );
}
return false;
--
To view, visit https://gerrit.wikimedia.org/r/289145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
