Merge pull request #87 from oSoMoN/fix-issue-50

Fix issue #50

Author: coderifous

dist/jquery.localize.js

@@ -41,16 +41,11 @@ http://keith-wood.name/localisation.html
           }
           break;
         case 2:
-          if (lang.length >= 2) {
-            file = "" + pkg + "-" + (lang.substring(0, 2)) + "." + fileExtension;
-            return jsonCall(file, pkg, lang, level);
-          }
-          break;
+          file = "" + pkg + "-" + (lang.split('-')[0]) + "." + fileExtension;
+          return jsonCall(file, pkg, lang, level);
         case 3:
-          if (lang.length >= 5) {
-            file = "" + pkg + "-" + (lang.substring(0, 5)) + "." + fileExtension;
-            return jsonCall(file, pkg, lang, level);
-          }
+          file = "" + pkg + "-" + (lang.split('-').slice(0, 2).join('-')) + "." + fileExtension;
+          return jsonCall(file, pkg, lang, level);
       }
     };
     jsonCall = function(file, pkg, lang, level) {

dist/jquery.localize.min.js

@@ -34,13 +34,11 @@ do ($ = jQuery) ->
           else
             loadLanguage(pkg, lang, 2)
         when 2
-          if lang.length >= 2
-            file = "#{pkg}-#{lang.substring(0, 2)}.#{fileExtension}"
-            jsonCall(file, pkg, lang, level)
+          file = "#{pkg}-#{lang.split('-')[0]}.#{fileExtension}"
+          jsonCall(file, pkg, lang, level)
         when 3
-          if lang.length >= 5
-            file = "#{pkg}-#{lang.substring(0, 5)}.#{fileExtension}"
-            jsonCall(file, pkg, lang, level)
+          file = "#{pkg}-#{lang.split('-').slice(0,2).join('-')}.#{fileExtension}"
+          jsonCall(file, pkg, lang, level)
 
     jsonCall = (file, pkg, lang, level) ->
       file = "#{options.pathPrefix}/#{file}" if options.pathPrefix?

src/jquery.localize.coffee

@@ -0,0 +1,3 @@
+{
+  "basic": "basic success"
+}

test/lang/test-ast.json

@@ -149,6 +149,13 @@ do ($ = jQuery) ->
     t.localize("test", opts)
     equal t.text(), "country code success"
 
+  # Ref: https://github.com/coderifous/jquery-localize/issues/50
+  test "three-letter language code", ->
+    opts = language: "ast", pathPrefix: "lang"
+    t = localizableTagWithRel("p", "basic", text: "basic fail")
+    t.localize("test", opts)
+    equal t.text(), "basic success"
+
   module "Language optimization"
 
   test "skipping language using string match", ->

test/localize_test.coffee

@@ -233,6 +233,18 @@
     t.localize("test", opts);
     return equal(t.text(), "country code success");
   });
+  test("three-letter language code", function() {
+    var opts, t;
+    opts = {
+      language: "ast",
+      pathPrefix: "lang"
+    };
+    t = localizableTagWithRel("p", "basic", {
+      text: "basic fail"
+    });
+    t.localize("test", opts);
+    return equal(t.text(), "basic success");
+  });
   module("Language optimization");
   test("skipping language using string match", function() {
     var opts, t;