From d63a3781031042340cb27fcfe2aa6ec223426035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 13 Nov 2017 09:27:54 +0800
Subject: [PATCH] fixed

#1090 #2387 #379
---
 src/locale/index.js      | 4 ++--
 src/locale/lang/de-DE.js | 2 +-
 src/locale/lang/en-US.js | 2 +-
 src/locale/lang/es-ES.js | 2 +-
 src/locale/lang/fr-FR.js | 2 +-
 src/locale/lang/id-ID.js | 2 +-
 src/locale/lang/ja-JP.js | 2 +-
 src/locale/lang/ko-KR.js | 2 +-
 src/locale/lang/pt-BR.js | 2 +-
 src/locale/lang/pt-PT.js | 2 +-
 src/locale/lang/ru-RU.js | 2 +-
 src/locale/lang/sv-SE.js | 2 +-
 src/locale/lang/tr-TR.js | 2 +-
 src/locale/lang/uk-UA.js | 2 +-
 src/locale/lang/vi-VN.js | 2 +-
 src/locale/lang/zh-CN.js | 2 +-
 src/locale/lang/zh-TW.js | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/locale/index.js b/src/locale/index.js
index c6615c2b..4e40ce37 100644
--- a/src/locale/index.js
+++ b/src/locale/index.js
@@ -47,12 +47,12 @@ export const i18n = function(fn) {
 
 // using with vue-i18n in CDN
 /*eslint-disable */
-export const setLang = function (l) {
+export const setLang = function (name, lang) {
     if (typeof window.iview !== 'undefined') {
         if (!('langs' in iview)) {
             iview.langs = {};
         }
-        iview.langs[l] = lang;
+        iview.langs[name] = lang;
     }
 };
 /*eslint-enable */
diff --git a/src/locale/lang/de-DE.js b/src/locale/lang/de-DE.js
index 71219711..daefbb10 100644
--- a/src/locale/lang/de-DE.js
+++ b/src/locale/lang/de-DE.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js
index 1fb76c8c..6940d8fa 100644
--- a/src/locale/lang/en-US.js
+++ b/src/locale/lang/en-US.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/es-ES.js b/src/locale/lang/es-ES.js
index 27709df6..44b68252 100644
--- a/src/locale/lang/es-ES.js
+++ b/src/locale/lang/es-ES.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/fr-FR.js b/src/locale/lang/fr-FR.js
index 276456d2..a6a42030 100644
--- a/src/locale/lang/fr-FR.js
+++ b/src/locale/lang/fr-FR.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/id-ID.js b/src/locale/lang/id-ID.js
index b9f5087b..fc73bc10 100644
--- a/src/locale/lang/id-ID.js
+++ b/src/locale/lang/id-ID.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/ja-JP.js b/src/locale/lang/ja-JP.js
index ccd28277..16204b79 100644
--- a/src/locale/lang/ja-JP.js
+++ b/src/locale/lang/ja-JP.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/ko-KR.js b/src/locale/lang/ko-KR.js
index 012e54d3..50dbf489 100644
--- a/src/locale/lang/ko-KR.js
+++ b/src/locale/lang/ko-KR.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/pt-BR.js b/src/locale/lang/pt-BR.js
index ffa89027..dc548990 100644
--- a/src/locale/lang/pt-BR.js
+++ b/src/locale/lang/pt-BR.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/pt-PT.js b/src/locale/lang/pt-PT.js
index 8cc91e04..f1258654 100644
--- a/src/locale/lang/pt-PT.js
+++ b/src/locale/lang/pt-PT.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js
index 3a72047a..0c1d4141 100644
--- a/src/locale/lang/ru-RU.js
+++ b/src/locale/lang/ru-RU.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/sv-SE.js b/src/locale/lang/sv-SE.js
index ee2d66b3..e0e7ced1 100644
--- a/src/locale/lang/sv-SE.js
+++ b/src/locale/lang/sv-SE.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/tr-TR.js b/src/locale/lang/tr-TR.js
index f443fba0..2e1a884d 100644
--- a/src/locale/lang/tr-TR.js
+++ b/src/locale/lang/tr-TR.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/uk-UA.js b/src/locale/lang/uk-UA.js
index 5c76a29c..115c9f23 100644
--- a/src/locale/lang/uk-UA.js
+++ b/src/locale/lang/uk-UA.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/vi-VN.js b/src/locale/lang/vi-VN.js
index a29fcda5..165714a2 100644
--- a/src/locale/lang/vi-VN.js
+++ b/src/locale/lang/vi-VN.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index 0af55fc4..74ad7d1e 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
index 109f9c1d..424e6d8b 100644
--- a/src/locale/lang/zh-TW.js
+++ b/src/locale/lang/zh-TW.js
@@ -100,6 +100,6 @@ const lang = {
     }
 };
 
-setLang(lang.i.locale);
+setLang(lang.i.locale, lang);
 
 export default lang;
\ No newline at end of file