From df1fec0c7b5673b45fc74a0f1bd506589fdfbf8a Mon Sep 17 00:00:00 2001 From: "Yngve Devik Hammersland (yhd)" Date: Tue, 2 Jul 2013 18:03:53 +0200 Subject: [PATCH 1/3] Removed truncating of region specification. (zh-Hans was being truncated to zh-Ha) --- build/jquery.localize.js | 4 ++-- src/jquery.localize.coffee | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jquery.localize.js b/build/jquery.localize.js index 439c6e2..377acea 100644 --- a/build/jquery.localize.js +++ b/build/jquery.localize.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.3 (function() { var $, normaliseLang; @@ -45,7 +45,7 @@ break; case 3: if (lang.length >= 5) { - file = "" + pkg + "-" + (lang.substring(0, 5)) + "." + fileExtension; + file = "" + pkg + "-" + lang + "." + fileExtension; return jsonCall(file, pkg, lang, level); } } diff --git a/src/jquery.localize.coffee b/src/jquery.localize.coffee index 7eb5cdf..d564d05 100644 --- a/src/jquery.localize.coffee +++ b/src/jquery.localize.coffee @@ -37,7 +37,7 @@ $.localize = (pkg, options = {}) -> jsonCall(file, pkg, lang, level) when 3 if lang.length >= 5 - file = "#{pkg}-#{lang.substring(0, 5)}.#{fileExtension}" + file = "#{pkg}-#{lang}.#{fileExtension}" jsonCall(file, pkg, lang, level) jsonCall = (file, pkg, lang, level) -> From a438e34ac5c0a7757a21f5946f846a3bc437420a Mon Sep 17 00:00:00 2001 From: "Yngve Devik Hammersland (yhd)" Date: Wed, 3 Jul 2013 09:49:09 +0200 Subject: [PATCH 2/3] Changed language id normalization to support zh-Hans. --- build/jquery.localize.js | 5 +++-- src/jquery.localize.coffee | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/jquery.localize.js b/build/jquery.localize.js index 377acea..82dca1d 100644 --- a/build/jquery.localize.js +++ b/build/jquery.localize.js @@ -6,8 +6,9 @@ normaliseLang = function(lang) { lang = lang.replace(/_/, '-').toLowerCase(); - if (lang.length > 3) { - lang = lang.substring(0, 3) + lang.substring(3).toUpperCase(); + lang = lang.substring(0, 2).toLowerCase() + lang.substring(2); + if (lang.length === 5) { + lang = lang.substring(0, 3).toLowerCase() + lang.substring(3); } return lang; }; diff --git a/src/jquery.localize.coffee b/src/jquery.localize.coffee index d564d05..f9149e4 100644 --- a/src/jquery.localize.coffee +++ b/src/jquery.localize.coffee @@ -7,11 +7,13 @@ $ = jQuery -# Ensures language code is in the format aa-AA. +# Ensures language code is in the format aa-AA, or if longer, +# keep capitalization (zh-Hans) of second part. normaliseLang = (lang) -> lang = lang.replace(/_/, '-').toLowerCase() - if lang.length > 3 - lang = lang.substring(0, 3) + lang.substring(3).toUpperCase() + lang = lang.substring(0, 2).toLowerCase() + lang.substring(2) + if lang.length == 5 + lang = lang.substring(0, 3).toLowerCase() + lang.substring(3) lang # Mozilla uses .language, IE uses .userLanguage From 2b328a6ee92f64ec65ac8a6c6da1df0a303893ed Mon Sep 17 00:00:00 2001 From: "Yngve Devik Hammersland (yhd)" Date: Wed, 3 Jul 2013 09:58:15 +0200 Subject: [PATCH 3/3] Fixed bugs with capitalization when normalizing language ids. --- build/jquery.localize.js | 4 ++-- src/jquery.localize.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jquery.localize.js b/build/jquery.localize.js index 82dca1d..57f4f25 100644 --- a/build/jquery.localize.js +++ b/build/jquery.localize.js @@ -5,10 +5,10 @@ $ = jQuery; normaliseLang = function(lang) { - lang = lang.replace(/_/, '-').toLowerCase(); + lang = lang.replace(/_/, '-'); lang = lang.substring(0, 2).toLowerCase() + lang.substring(2); if (lang.length === 5) { - lang = lang.substring(0, 3).toLowerCase() + lang.substring(3); + lang = lang.substring(0, 3) + lang.substring(3).toUpperCase(); } return lang; }; diff --git a/src/jquery.localize.coffee b/src/jquery.localize.coffee index f9149e4..b101653 100644 --- a/src/jquery.localize.coffee +++ b/src/jquery.localize.coffee @@ -10,10 +10,10 @@ $ = jQuery # Ensures language code is in the format aa-AA, or if longer, # keep capitalization (zh-Hans) of second part. normaliseLang = (lang) -> - lang = lang.replace(/_/, '-').toLowerCase() + lang = lang.replace(/_/, '-') lang = lang.substring(0, 2).toLowerCase() + lang.substring(2) if lang.length == 5 - lang = lang.substring(0, 3).toLowerCase() + lang.substring(3) + lang = lang.substring(0, 3) + lang.substring(3).toUpperCase() lang # Mozilla uses .language, IE uses .userLanguage