bryce/jquery.uls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support language codes that are redirects

Browse Source 
Addressing issue #207

Such language codes were not listed in ULS language list.

Root cause was $.uls.data.getLanguagesByScriptGroup was returning
a map of script groups, which contained only resolved language codes.
And later in append method of jquery.uls.lcd.js, there is a check if
that language code is part of languages list passed as option to uls()
call. This test fails and the language code does not get added to display.

Change-Id: Iec914a9694a46eef5750ef3af7346d66e052ab77
This commit is contained in:
Santhosh Thottingal
2016-04-04 16:29:25 +05:30
parent 1e8c2168f6
commit 8b3d77dae1
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/jquery.uls.data.utils.js
View File

@@ -245,21 +245,18 @@
*/ */
$.uls.data.getLanguagesByScriptGroup = function ( languages ) { $.uls.data.getLanguagesByScriptGroup = function ( languages ) {
var languagesByScriptGroup = {}, var languagesByScriptGroup = {},
language, codeToAdd, langScriptGroup; language, resolvedRedirect, langScriptGroup;
for ( language in languages ) { for ( language in languages ) {
codeToAdd = $.uls.data.isRedirect( language ) || language; resolvedRedirect = $.uls.data.isRedirect( language ) || language;
langScriptGroup = $.uls.data.getScriptGroupOfLanguage( codeToAdd ); langScriptGroup = $.uls.data.getScriptGroupOfLanguage( resolvedRedirect );
if ( !languagesByScriptGroup[langScriptGroup] ) { if ( !languagesByScriptGroup[langScriptGroup] ) {
languagesByScriptGroup[langScriptGroup] = []; languagesByScriptGroup[langScriptGroup] = [];
} }
// Prevent duplicate adding of redirects languagesByScriptGroup[langScriptGroup].push( language );
if ( $.inArray( codeToAdd, languagesByScriptGroup[langScriptGroup] ) === -1 ) {
languagesByScriptGroup[langScriptGroup].push( codeToAdd );
}
} }
return languagesByScriptGroup; return languagesByScriptGroup;

4
src/jquery.uls.lcd.js
View File

@@ -66,13 +66,13 @@
* Adds language to the language list. * Adds language to the language list.
* @param {string} langCode * @param {string} langCode
* @param {string} [regionCode] * @param {string} [regionCode]
* @return {bool} Whether the language was added. * @return {boolean} Whether the language was added.
*/ */
append: function ( langCode, regionCode ) { append: function ( langCode, regionCode ) {
var lcd = this, var lcd = this,
i, regions; i, regions;
if ( !this.options.languages[ langCode ] ) { if ( !$.uls.data.languages[ langCode ] ) {
// Language is unknown or not in the list of languages for this context. // Language is unknown or not in the list of languages for this context.
return false; return false;
} }

4
test/jquery.uls.test.js
View File

@@ -227,8 +227,8 @@
'vro': 'Võro' // Target after alias 'vro': 'Võro' // Target after alias
}; };
groupedLanguages = { groupedLanguages = {
Latin: [ 'en', 'vro', 'sr-latn' ], Latin: [ 'en', 'fiu-vro', 'sr-latn', 'sr-el', 'vro' ],
Cyrillic: [ 'ru', 'sr-cyrl' ] Cyrillic: [ 'ru', 'sr', 'sr-cyrl' ]
}; };
assert.deepEqual( $.uls.data.getLanguagesByScriptGroup( languagesToGroup ), groupedLanguages, assert.deepEqual( $.uls.data.getLanguagesByScriptGroup( languagesToGroup ), groupedLanguages,