bryce/language-data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move sorting by autonym out of sortByScriptGroup

Browse Source
This commit is contained in:
Amire80
2018-05-22 16:59:34 +03:00
committed by Niklas Laxström
parent 16d6409be1
commit 5135498b2c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.js
View File

@@ -204,15 +204,13 @@ function getLanguagesByScriptGroupInRegion( region ) {
*/ */
function sortByScriptGroup( languages ) { function sortByScriptGroup( languages ) {
var groupedLanguages, scriptGroups, i, var groupedLanguages, scriptGroups, i,
sortedByAutonym = [],
allLanguages = []; allLanguages = [];
groupedLanguages = getLanguagesByScriptGroup( languages ); groupedLanguages = getLanguagesByScriptGroup( languages );
scriptGroups = Object.keys( groupedLanguages ).sort(); scriptGroups = Object.keys( groupedLanguages ).sort();
for ( i = 0; i < scriptGroups.length; i++ ) { for ( i = 0; i < scriptGroups.length; i++ ) {
sortedByAutonym = groupedLanguages[ scriptGroups[i] ].sort( sortByAutonym ) allLanguages = allLanguages.concat( groupedLanguages[ scriptGroups[i] ] );
allLanguages = allLanguages.concat( sortedByAutonym );
} }
return allLanguages; return allLanguages;

2
test/index.js
View File

@@ -127,7 +127,7 @@ describe( 'languagedata', function () {
languagesAM = [ 'atj', 'chr', 'chy', 'cr', 'en', 'es', 'fr', 'gn', 'haw', 'ike-cans', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'yi' ]; languagesAM = [ 'atj', 'chr', 'chy', 'cr', 'en', 'es', 'fr', 'gn', 'haw', 'ike-cans', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'yi' ];
assert.deepEqual( assert.deepEqual(
languageData.sortByScriptGroup( languagesAM ), languageData.sortByScriptGroup( languagesAM.sort( languageData.sortByAutonym ) ),
[ 'atj', 'gn', 'en', 'es', 'fr', 'haw', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'chy', 'yi', 'ike-cans', 'cr', 'chr' ], [ 'atj', 'gn', 'en', 'es', 'fr', 'haw', 'ik', 'kl', 'nl', 'pt', 'qu', 'srn', 'chy', 'yi', 'ike-cans', 'cr', 'chr' ],
'languages in region AM are ordered correctly by script group' 'languages in region AM are ordered correctly by script group'
); );