public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

html10n.js: Finally fix two-part locale specs 

fixes #1706
pull/1711/head
Marcel Klehr 2013-04-05 14:18:46 +02:00
parent 7cbce4543e
commit 402a4b7b3e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/static/js/html10n.js
View File

@ -177,8 +177,7 @@ window.html10n = (function(window, document, undefined) {
cb(new Error('A file couldn\'t be parsed as json.'))
return
}
if (!data[lang]) lang = lang.substr(0, lang.indexOf('-') == -1? lang.length : lang.indexOf('-'))
if (!data[lang]) {
cb(new Error('Couldn\'t find translations for '+lang))
return
@ -667,7 +666,15 @@ window.html10n = (function(window, document, undefined) {
var that = this
// if only one string => create an array
if ('string' == typeof langs) langs = [langs]
// Expand two-part locale specs
var i=0
langs.forEach(function(lang) {
if(!lang) return
langs[i++] = lang
if(~lang.indexOf('-')) langs[i++] = lang.substr(0, lang.indexOf('-'))
})
this.build(langs, function(er, translations) {
html10n.translations = translations
html10n.translateElement(translations)