diff --git a/lib/jquery.i18n.js b/lib/jquery.i18n.js index d8d2cfe9..fb0b60f5 100644 --- a/lib/jquery.i18n.js +++ b/lib/jquery.i18n.js @@ -1647,7 +1647,7 @@ * @return {String} */ convertGrammar: function ( word, form ) { - return word + form; + return word; }, /** diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js index 74ab38b0..e1ff9247 100644 --- a/resources/js/ext.uls.init.js +++ b/resources/js/ext.uls.init.js @@ -91,8 +91,8 @@ }; $( document ).ready( function () { - var extensionPath = mw.config.get( 'wgExtensionAssetsPath' ) + - '/UniversalLanguageSelector/'; + var extensionPath = mw.config.get( 'wgExtensionAssetsPath' ) + + '/UniversalLanguageSelector/'; // i18n initialization var i18n = $.i18n( { locale: currentLang, @@ -102,8 +102,13 @@ } ); // localization for jquery.uls i18n.load( extensionPath + 'lib/jquery.uls/i18n/' + currentLang + ".json", currentLang ); + // localization for jquery.uls- fallback locale + i18n.load( extensionPath + 'lib/jquery.uls/i18n/en.json', 'en' ); // localization for mediaWiki ULS i18n.load( extensionPath + 'i18n/' + currentLang + ".json", currentLang ); + // localization for mediaWiki ULS- fallback locale + i18n.load( extensionPath + 'i18n/en.json', 'en' ); + var $ulsTrigger = $( '.uls-trigger' ), previousLanguages = mw.uls.getPreviousLanguages() || [], previousLang = previousLanguages.slice( -1 )[0];