Merge 33b3e52 into 8d440d0

blockchain · Dec 16, 2015 · b9903a7 · b9903a7
2 parents 8d440d0 + 33b3e52
commit b9903a7
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/assets/js/services/bcTranslationLoader.service.js b/assets/js/services/bcTranslationLoader.service.js
@@ -16,7 +16,7 @@ function BCTranslateStaticFilesLoader($http, $q, $translateStaticFilesLoader) {
     pt: 'build/locales/pt.json',
     bg: 'build/locales/bg.json',
     fr: 'build/locales/fr.json',
-    'zh-cn': 'build/locales/zh-cn.json',
+    zh_CN: 'build/locales/zh-cn.json',
     hu: 'build/locales/hu.json',
     sl: 'build/locales/sl.json',
     id: 'build/locales/id.json',
@@ -36,22 +36,22 @@ function BCTranslateStaticFilesLoader($http, $q, $translateStaticFilesLoader) {
     tr: 'build/locales/tr.json'
   };
 
-  return function(options) {
-    if (map[options.key]) {
-      let mapped = map[options.key];
-      let deferred = $q.defer();
-      $http(angular.extend({
-        url: mapped,
-        method: 'GET',
-        params: ''
-      }, options.$http)).success(function(data) {
-        deferred.resolve(data);
-      }).error(function(data) {
+  return function (options) {
+    let mapped = map[options.key] || map['en'];
+    let deferred = $q.defer();
+
+    let httpOptions = angular.extend({
+      url: mapped,
+      method: 'GET',
+      params: ''
+    }, options.$http);
+
+    $http(httpOptions)
+      .success(deferred.resolve)
+      .error(function (data) {
         deferred.reject(options.key);
       });
-      return deferred.promise;
-    } else {
-      return console.log('Don\'t know which language file to fetch');
-    }
+
+    return deferred.promise;
   };
 }