jenkins-bot has submitted this change and it was merged.
Change subject: Show an autonym for languages that don't have input methods
......................................................................
Show an autonym for languages that don't have input methods
Bug: 51025
Change-Id: I4a6cc9a79f186941cc79533de90ab0fb7e104673
---
M resources/js/ext.uls.ime.js
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 38683a9..a3c03a2 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -181,9 +181,18 @@
$.extend( $.ime.defaults, {
imePath: mwImeRulesPath
} );
+
// Load the ime preferences
$.ime.preferences.load();
+
$.fn.imeselector.Constructor.prototype.helpLink =
customHelpLink;
+
+ // Override the autonym function for the case that
+ // somebody tries to select a language for which there are
+ // no input methods, which is possible in MediaWiki
+ $.fn.imeselector.Constructor.prototype.getAutonym = function (
languageCode ) {
+ return $.uls.data.getAutonym( languageCode );
+ };
};
mw.ime.setup = function () {
@@ -260,7 +269,7 @@
// Some fields may be uninitialized
imeselector = $input.data( 'imeselector' );
if ( imeselector ) {
- imeselector.selectLanguage(
$.ime.preferences.getLanguage() );
+ imeselector.selectLanguage(
imeselector.decideLanguage() );
imeselector.$element.on( 'setim.ime', function
( event, inputMethod ) {
mw.hook( 'mw.uls.ime.change' ).fire(
inputMethod );
} );
--
To view, visit https://gerrit.wikimedia.org/r/80017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a6cc9a79f186941cc79533de90ab0fb7e104673
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: KartikMistry <kartik.mis...@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
