From 325a394fcbdee228967c3a06561ebc7b51b404c4 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Mon, 25 Jul 2016 11:50:14 -0700
Subject: [PATCH] Bugs (#798)

* Only go to languages docs supports

* Fix loading chinese for Safari
---
 app/services/settings.js                       | 2 +-
 app/services/user-language.js                  | 5 ++++-
 app/utils/constants.js                         | 1 +
 crowdin.yaml                                   | 2 +-
 package.json                                   | 2 +-
 translations/ja-jp.yaml                        | 2 +-
 translations/{zh-Hans-CN.yaml => zh-hans.yaml} | 0
 7 files changed, 9 insertions(+), 5 deletions(-)
 rename translations/{zh-Hans-CN.yaml => zh-hans.yaml} (100%)

diff --git a/app/services/settings.js b/app/services/settings.js
index e8d6378ee..37fa20785 100644
--- a/app/services/settings.js
+++ b/app/services/settings.js
@@ -179,7 +179,7 @@ export default Ember.Service.extend(Ember.Evented, {
   docsBase: function() {
     let version = this.get(`asMap.${C.SETTING.HELP_VERSION}.value`);
     let lang = (this.get('intl._locale')[0]||'').replace(/-.*$/,'');
-    if ( !lang || lang === 'none' ) {
+    if ( !lang || lang === 'none' || C.LANGUAGE.DOCS.indexOf(lang) === -1 ) {
       lang = 'en';
     }
 
diff --git a/app/services/user-language.js b/app/services/user-language.js
index c76c2e86b..32cb927b8 100644
--- a/app/services/user-language.js
+++ b/app/services/user-language.js
@@ -67,7 +67,7 @@ export default Ember.Service.extend({
       }).then((resp) => {
         let promise;
         if ( this.get('app.needIntlPolyfill') ) {
-          promise = loadScript(`${this.get('app.baseAssets')}assets/intl/locales/${language}.js?${application.version}`);
+          promise = loadScript(`${this.get('app.baseAssets')}assets/intl/locales/${language.toLowerCase()}.js?${application.version}`);
         } else {
           promise = Ember.RSVP.resolve();
         }
@@ -80,6 +80,9 @@ export default Ember.Service.extend({
         });
       }).catch((err) => {
         this.get('growl').fromError('Error loading language: ' + language, err);
+        if ( language !== C.LANGUAGE.DEFAULT ) {
+          return this.sideLoadLanguage(C.LANGUAGE.DEFAULT);
+        }
       });
     }
   },
diff --git a/app/utils/constants.js b/app/utils/constants.js
index 2a92fa108..d19d29e69 100644
--- a/app/utils/constants.js
+++ b/app/utils/constants.js
@@ -136,6 +136,7 @@ var C = {
   LANGUAGE: {
     DEFAULT: 'en-us',
     FORMAT_RELATIVE_TIMEOUT: 1000,
+    DOCS: ['en'],
   },
 
   THEME: {
diff --git a/crowdin.yaml b/crowdin.yaml
index 0a6733894..ba26cb6d8 100644
--- a/crowdin.yaml
+++ b/crowdin.yaml
@@ -11,4 +11,4 @@ files:
         'ja-JP': 'ja-jp'
         'pt-BR': 'pt-br'
         'ru-RU': 'ru-ru'
-        'zh-CN': 'zh-Hans-CN'
+        'zh-CN': 'zh-hans'
diff --git a/package.json b/package.json
index 8a61f0401..0cdec4019 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "private": true,
   "directories": {
     "doc": "doc",
diff --git a/translations/ja-jp.yaml b/translations/ja-jp.yaml
index 6c638334d..e58a23319 100644
--- a/translations/ja-jp.yaml
+++ b/translations/ja-jp.yaml
@@ -2821,7 +2821,7 @@ waitKubernetes:
   addHost: '1台のホストを追加しています'
   activateHost: 'ホストがアクティブになるのを待っています'
   createStack: 'Kubernetes のシステムスタックを作成中'
-  startServices: 'サービスを起動中 ({sub} of {count})'
+  startServices: 'サービスを起動中'
   waitApi: 'Kubernetes API を待っています'
   createNamespace: '名前空間を作成中'
 
diff --git a/translations/zh-Hans-CN.yaml b/translations/zh-hans.yaml
similarity index 100%
rename from translations/zh-Hans-CN.yaml
rename to translations/zh-hans.yaml