Skip to content

Commit cb7b212

Browse files
committed
【fix】修复leaflet组件获取国际化错误的问题
1 parent d7389bf commit cb7b212

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/common/lang/Lang.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@ let Lang = {
6161
*/
6262
setCode: function () {
6363
var lang = this.getLanguageFromCookie();
64-
if (lang) {
65-
Lang.code = lang;
66-
return;
67-
}
68-
lang = Lang.defaultCode;
69-
if (navigator.appName === 'Netscape') {
70-
lang = navigator.language;
71-
} else {
72-
lang = navigator.browserLanguage;
64+
if (!lang) {
65+
lang = Lang.defaultCode;
66+
if (navigator.appName === 'Netscape') {
67+
lang = navigator.language;
68+
} else {
69+
lang = navigator.browserLanguage;
70+
}
7371
}
7472
if (lang.indexOf('zh') === 0) {
7573
lang = 'zh-CN';

test/test-main-common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,4 @@ import './common/components/chart/ChartViewModelSpec';
202202
import './common/components/chart/ChartViewSpec';
203203

204204
import './common/util/FetchRequestSpec';
205+
import './common/lang/LangSpec.js';

0 commit comments

Comments
 (0)