Merge branch 'fix-issue-47' of https://github.com/oSoMoN/jquery-localize into oSoMoN-fix-issue-47

* 'fix-issue-47' of https://github.com/oSoMoN/jquery-localize:
  Update the test expectation to make it unambiguous.
  When a language-country code was requested, do not fail early if the language only file doesn't exist.
  Add a failing unit test for #47.

Author: coderifous

dist/jquery.localize.js

@@ -59,7 +59,9 @@ http://keith-wood.name/localisation.html
         return loadLanguage(pkg, lang, level + 1);
       };
       errorFunc = function() {
-        if (options.fallback && options.fallback !== lang) {
+        if (level === 2 && lang.indexOf('-') > -1) {
+          return loadLanguage(pkg, lang, level + 1);
+        } else if (options.fallback && options.fallback !== lang) {
           return loadLanguage(pkg, options.fallback);
         }
       };

dist/jquery.localize.min.js

@@ -47,7 +47,11 @@ do ($ = jQuery) ->
         notifyDelegateLanguageLoaded(intermediateLangData)
         loadLanguage(pkg, lang, level + 1)
       errorFunc = ->
-        if options.fallback && options.fallback != lang
+        if level == 2 && lang.indexOf('-') > -1
+          # the language-only file may not exist, try the language-country file next
+          # (ref: https://github.com/coderifous/jquery-localize/issues/47)
+          loadLanguage(pkg, lang, level + 1)
+        else if options.fallback && options.fallback != lang
           loadLanguage(pkg, options.fallback)
       ajaxOptions =
         url: file

src/jquery.localize.coffee

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

test/lang/test-zh-CN.json

@@ -156,6 +156,13 @@ do ($ = jQuery) ->
     t.localize("test", opts)
     equal t.text(), "basic success"
 
+  # Ref: https://github.com/coderifous/jquery-localize/issues/47
+  test "language-country code with no language-only file", ->
+    opts = language: "zh-CN", pathPrefix: "lang"
+    t = localizableTagWithRel("p", "basic", text: "basic fail")
+    t.localize("test", opts)
+    equal t.text(), "basic success zh-CN"
+
   module "Language optimization"
 
   test "skipping language using string match", ->

test/localize_test.coffee

@@ -245,6 +245,18 @@
     t.localize("test", opts);
     return equal(t.text(), "basic success");
   });
+  test("language-country code with no language-only file", function() {
+    var opts, t;
+    opts = {
+      language: "zh-CN",
+      pathPrefix: "lang"
+    };
+    t = localizableTagWithRel("p", "basic", {
+      text: "basic fail"
+    });
+    t.localize("test", opts);
+    return equal(t.text(), "basic success zh-CN");
+  });
   module("Language optimization");
   test("skipping language using string match", function() {
     var opts, t;