cldrjs
Advanced tools
Comparing version 0.4.4 to 0.4.5
@@ -127,3 +127,3 @@ /** | ||
territory = subtags[ 2 ], | ||
variantsAndUnicodeLocaleExtensions = subtags.slice( 3, 4 ); | ||
variants = subtags.slice( 3, 4 ); | ||
options = options || {}; | ||
@@ -133,3 +133,3 @@ | ||
if ( language !== "und" && script !== "Zzzz" && territory !== "ZZ" ) { | ||
return [ language, script, territory ].concat( variantsAndUnicodeLocaleExtensions ); | ||
return [ language, script, territory ].concat( variants ); | ||
} | ||
@@ -161,5 +161,3 @@ | ||
territory !== "ZZ" ? territory : match[ 2 ] | ||
].concat( | ||
variantsAndUnicodeLocaleExtensions | ||
); | ||
].concat( variants ); | ||
} else if ( options.force ) { | ||
@@ -589,3 +587,4 @@ // [3.1.2] | ||
var attributes, language, maxLanguageId, minLanguageId, script, subtags, territory, unicodeLocaleExtensions, variant, | ||
sep = Cldr.localeSep; | ||
sep = Cldr.localeSep, | ||
unicodeLocaleExtensionsRaw = ""; | ||
@@ -597,3 +596,10 @@ validatePresence( locale, "locale" ); | ||
unicodeLocaleExtensions = subtags[ 4 ]; | ||
if ( subtags.length === 5 ) { | ||
unicodeLocaleExtensions = subtags.pop(); | ||
unicodeLocaleExtensionsRaw = sep + "u" + sep + unicodeLocaleExtensions; | ||
// Remove trailing null when there is unicodeLocaleExtensions but no variants. | ||
if ( !subtags[ 3 ] ) { | ||
subtags.pop(); | ||
} | ||
} | ||
variant = subtags[ 3 ]; | ||
@@ -622,4 +628,4 @@ | ||
// Unicode Language Id | ||
minlanguageId: minLanguageId, | ||
maxLanguageId: maxLanguageId.join( sep ), | ||
minLanguageId: minLanguageId + unicodeLocaleExtensionsRaw, | ||
maxLanguageId: maxLanguageId.join( sep ) + unicodeLocaleExtensionsRaw, | ||
@@ -626,0 +632,0 @@ // Unicode Language Id Subtabs |
@@ -46,3 +46,4 @@ | ||
var attributes, language, maxLanguageId, minLanguageId, script, subtags, territory, unicodeLocaleExtensions, variant, | ||
sep = Cldr.localeSep; | ||
sep = Cldr.localeSep, | ||
unicodeLocaleExtensionsRaw = ""; | ||
@@ -54,3 +55,10 @@ validatePresence( locale, "locale" ); | ||
unicodeLocaleExtensions = subtags[ 4 ]; | ||
if ( subtags.length === 5 ) { | ||
unicodeLocaleExtensions = subtags.pop(); | ||
unicodeLocaleExtensionsRaw = sep + "u" + sep + unicodeLocaleExtensions; | ||
// Remove trailing null when there is unicodeLocaleExtensions but no variants. | ||
if ( !subtags[ 3 ] ) { | ||
subtags.pop(); | ||
} | ||
} | ||
variant = subtags[ 3 ]; | ||
@@ -79,4 +87,4 @@ | ||
// Unicode Language Id | ||
minlanguageId: minLanguageId, | ||
maxLanguageId: maxLanguageId.join( sep ), | ||
minLanguageId: minLanguageId + unicodeLocaleExtensionsRaw, | ||
maxLanguageId: maxLanguageId.join( sep ) + unicodeLocaleExtensionsRaw, | ||
@@ -83,0 +91,0 @@ // Unicode Language Id Subtabs |
@@ -51,3 +51,3 @@ | ||
territory = subtags[ 2 ], | ||
variantsAndUnicodeLocaleExtensions = subtags.slice( 3, 4 ); | ||
variants = subtags.slice( 3, 4 ); | ||
options = options || {}; | ||
@@ -57,3 +57,3 @@ | ||
if ( language !== "und" && script !== "Zzzz" && territory !== "ZZ" ) { | ||
return [ language, script, territory ].concat( variantsAndUnicodeLocaleExtensions ); | ||
return [ language, script, territory ].concat( variants ); | ||
} | ||
@@ -85,5 +85,3 @@ | ||
territory !== "ZZ" ? territory : match[ 2 ] | ||
].concat( | ||
variantsAndUnicodeLocaleExtensions | ||
); | ||
].concat( variants ); | ||
} else if ( options.force ) { | ||
@@ -90,0 +88,0 @@ // [3.1.2] |
/** | ||
* CLDR JavaScript Library v0.4.4 | ||
* CLDR JavaScript Library v0.4.5 | ||
* http://jquery.com/ | ||
@@ -9,6 +9,6 @@ * | ||
* | ||
* Date: 2016-01-18T12:25Z | ||
* Date: 2016-05-03T19:58Z | ||
*/ | ||
/*! | ||
* CLDR JavaScript Library v0.4.4 2016-01-18T12:25Z MIT license © Rafael Xavier | ||
* CLDR JavaScript Library v0.4.5 2016-05-03T19:58Z MIT license © Rafael Xavier | ||
* http://git.io/h4lmVg | ||
@@ -128,3 +128,3 @@ */ | ||
territory = subtags[ 2 ], | ||
variantsAndUnicodeLocaleExtensions = subtags.slice( 3, 4 ); | ||
variants = subtags.slice( 3, 4 ); | ||
options = options || {}; | ||
@@ -134,3 +134,3 @@ | ||
if ( language !== "und" && script !== "Zzzz" && territory !== "ZZ" ) { | ||
return [ language, script, territory ].concat( variantsAndUnicodeLocaleExtensions ); | ||
return [ language, script, territory ].concat( variants ); | ||
} | ||
@@ -162,5 +162,3 @@ | ||
territory !== "ZZ" ? territory : match[ 2 ] | ||
].concat( | ||
variantsAndUnicodeLocaleExtensions | ||
); | ||
].concat( variants ); | ||
} else if ( options.force ) { | ||
@@ -590,3 +588,4 @@ // [3.1.2] | ||
var attributes, language, maxLanguageId, minLanguageId, script, subtags, territory, unicodeLocaleExtensions, variant, | ||
sep = Cldr.localeSep; | ||
sep = Cldr.localeSep, | ||
unicodeLocaleExtensionsRaw = ""; | ||
@@ -598,3 +597,10 @@ validatePresence( locale, "locale" ); | ||
unicodeLocaleExtensions = subtags[ 4 ]; | ||
if ( subtags.length === 5 ) { | ||
unicodeLocaleExtensions = subtags.pop(); | ||
unicodeLocaleExtensionsRaw = sep + "u" + sep + unicodeLocaleExtensions; | ||
// Remove trailing null when there is unicodeLocaleExtensions but no variants. | ||
if ( !subtags[ 3 ] ) { | ||
subtags.pop(); | ||
} | ||
} | ||
variant = subtags[ 3 ]; | ||
@@ -623,4 +629,4 @@ | ||
// Unicode Language Id | ||
minlanguageId: minLanguageId, | ||
maxLanguageId: maxLanguageId.join( sep ), | ||
minLanguageId: minLanguageId + unicodeLocaleExtensionsRaw, | ||
maxLanguageId: maxLanguageId.join( sep ) + unicodeLocaleExtensionsRaw, | ||
@@ -627,0 +633,0 @@ // Unicode Language Id Subtabs |
/** | ||
* CLDR JavaScript Library v0.4.4 | ||
* CLDR JavaScript Library v0.4.5 | ||
* http://jquery.com/ | ||
@@ -9,6 +9,6 @@ * | ||
* | ||
* Date: 2016-01-18T12:25Z | ||
* Date: 2016-05-03T19:58Z | ||
*/ | ||
/*! | ||
* CLDR JavaScript Library v0.4.4 2016-01-18T12:25Z MIT license © Rafael Xavier | ||
* CLDR JavaScript Library v0.4.5 2016-05-03T19:58Z MIT license © Rafael Xavier | ||
* http://git.io/h4lmVg | ||
@@ -15,0 +15,0 @@ */ |
/** | ||
* CLDR JavaScript Library v0.4.4 | ||
* CLDR JavaScript Library v0.4.5 | ||
* http://jquery.com/ | ||
@@ -9,6 +9,6 @@ * | ||
* | ||
* Date: 2016-01-18T12:25Z | ||
* Date: 2016-05-03T19:58Z | ||
*/ | ||
/*! | ||
* CLDR JavaScript Library v0.4.4 2016-01-18T12:25Z MIT license © Rafael Xavier | ||
* CLDR JavaScript Library v0.4.5 2016-05-03T19:58Z MIT license © Rafael Xavier | ||
* http://git.io/h4lmVg | ||
@@ -15,0 +15,0 @@ */ |
/** | ||
* CLDR JavaScript Library v0.4.4 | ||
* CLDR JavaScript Library v0.4.5 | ||
* http://jquery.com/ | ||
@@ -9,6 +9,6 @@ * | ||
* | ||
* Date: 2016-01-18T12:25Z | ||
* Date: 2016-05-03T19:58Z | ||
*/ | ||
/*! | ||
* CLDR JavaScript Library v0.4.4 2016-01-18T12:25Z MIT license © Rafael Xavier | ||
* CLDR JavaScript Library v0.4.5 2016-05-03T19:58Z MIT license © Rafael Xavier | ||
* http://git.io/h4lmVg | ||
@@ -15,0 +15,0 @@ */ |
/** | ||
* CLDR JavaScript Library v0.4.4 | ||
* CLDR JavaScript Library v0.4.5 | ||
* http://jquery.com/ | ||
@@ -9,6 +9,6 @@ * | ||
* | ||
* Date: 2016-01-18T12:25Z | ||
* Date: 2016-05-03T19:58Z | ||
*/ | ||
/*! | ||
* CLDR JavaScript Library v0.4.4 2016-01-18T12:25Z MIT license © Rafael Xavier | ||
* CLDR JavaScript Library v0.4.5 2016-05-03T19:58Z MIT license © Rafael Xavier | ||
* http://git.io/h4lmVg | ||
@@ -15,0 +15,0 @@ */ |
@@ -5,3 +5,3 @@ ## new Cldr( locale ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *locale* | String | `"en"`, `"pt-BR"` | |
@@ -5,3 +5,3 @@ ## .get( path ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *path* | String or<br>Array | `"/cldr/main/{languageId}/numbers/symbols-numberSystem-latn/decimal"`<br>`[ "cldr", "main", "{languageId}", "numbers", "symbols-numberSystem-latn", "decimal" ]` | |
@@ -5,3 +5,3 @@ ## .main( path ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *path* | String or<br>Array | See `cldr.get()` for more information | |
@@ -5,3 +5,3 @@ ## Cldr.off( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## Cldr.on( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## Cldr.once( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## .off( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## .on( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## .once( event, listener ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *event* | String | `"get"` | |
@@ -5,3 +5,3 @@ ## .supplemental( path ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *path* | String or<br>Array | See `cldr.get()` for more information | |
@@ -5,3 +5,3 @@ ## .get( path ) | ||
| Parameter | Type | Exampe | | ||
| Parameter | Type | Example | | ||
| --- | --- | --- | | ||
@@ -8,0 +8,0 @@ | *path* | String or<br>Array | See `cldr.get()` above for more information | |
{ | ||
"name": "cldrjs", | ||
"version": "0.4.4", | ||
"version": "0.4.5", | ||
"description": "Simple CLDR traverser", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
158564
77
3329