bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I1e913e08,I898bcf6e

Browse Source 
* changes:
  Update jquery.i18n from upstream
  Load the fallback locales
This commit is contained in:
Amire80
2012-10-13 11:12:48 +00:00
committed by Gerrit Code Review
parent 3ca9bbd8c3 f667c41d51
commit 702d45286e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jquery.i18n.js
View File

@@ -1647,7 +1647,7 @@
* @return {String} * @return {String}
*/ */
convertGrammar: function ( word, form ) { convertGrammar: function ( word, form ) {
return word + form; return word;
}, },
/** /**

9
resources/js/ext.uls.init.js
View File

@@ -91,8 +91,8 @@
}; };
$( document ).ready( function () { $( document ).ready( function () {
var extensionPath = mw.config.get( 'wgExtensionAssetsPath' ) + var extensionPath = mw.config.get( 'wgExtensionAssetsPath' )
'/UniversalLanguageSelector/'; + '/UniversalLanguageSelector/';
// i18n initialization // i18n initialization
var i18n = $.i18n( { var i18n = $.i18n( {
locale: currentLang, locale: currentLang,
@@ -102,8 +102,13 @@
} ); } );
// localization for jquery.uls // localization for jquery.uls
i18n.load( extensionPath + 'lib/jquery.uls/i18n/' + currentLang + ".json", currentLang ); 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 // localization for mediaWiki ULS
i18n.load( extensionPath + 'i18n/' + currentLang + ".json", currentLang ); i18n.load( extensionPath + 'i18n/' + currentLang + ".json", currentLang );
// localization for mediaWiki ULS- fallback locale
i18n.load( extensionPath + 'i18n/en.json', 'en' );
var $ulsTrigger = $( '.uls-trigger' ), var $ulsTrigger = $( '.uls-trigger' ),
previousLanguages = mw.uls.getPreviousLanguages() || [], previousLanguages = mw.uls.getPreviousLanguages() || [],
previousLang = previousLanguages.slice( -1 )[0]; previousLang = previousLanguages.slice( -1 )[0];