Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/85965
Change subject: Refactor all language, font change code to preview method
......................................................................
Refactor all language, font change code to preview method
Avoids duplication of code and better organising language and font
change logic
Change-Id: I4e95cfc2de7b650a75e2bd550af547647d5b3eb3
---
M resources/js/ext.uls.displaysettings.js
1 file changed, 4 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/65/85965/1
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 60df46a..995bf90 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -110,11 +110,7 @@
// Usually this is already loaded, but when changing
language it
// might not be.
- $.i18n().locale = this.uiLanguage;
- mw.uls.loadLocalization( this.uiLanguage )
- .done( $.proxy( this.i18n, this ) );
-
- this.$webfonts.refresh();
+ this.preview( this.uiLanguage );
this.listen();
this.dirty = false;
this.savedRegistry = $.extend( true, {},
mw.webfonts.preferences );
@@ -225,9 +221,6 @@
$( 'div.uls-ui-languages button.button'
).removeClass( 'down' );
button.addClass( 'down' );
displaySettings.prepareUIFonts();
- // set the language for the settings
panel so that webfonts
- // are correctly applied.
- displaySettings.$template.attr( 'lang',
displaySettings.uiLanguage );
displaySettings.preview(
displaySettings.uiLanguage );
};
}
@@ -346,9 +339,11 @@
*/
preview: function ( language ) {
var displaySettings = this;
-
+ this.$template.attr( 'lang', language );
+ $.i18n().locale = language;
mw.uls.loadLocalization( language ).done( function () {
displaySettings.i18n();
+ displaySettings.$webfonts.refresh();
} );
},
@@ -620,7 +615,6 @@
// Restore content and UI language
this.uiLanguage = this.getUILanguage();
this.contentLanguage = this.getContentLanguage();
- this.$template.attr( 'lang', this.uiLanguage );
this.close();
}
--
To view, visit https://gerrit.wikimedia.org/r/85965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e95cfc2de7b650a75e2bd550af547647d5b3eb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
