From 19ad577f57453a74e1cca2cb488ec89af8d50348 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Thu, 20 Feb 2020 16:45:10 +0800 Subject: [PATCH] fix: problem that can not set correct locale if language is like en-US --- gui/src/assets/scss/reset.scss | 2 +- gui/src/plugins/i18n.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gui/src/assets/scss/reset.scss b/gui/src/assets/scss/reset.scss index 0ae40038..75a19852 100644 --- a/gui/src/assets/scss/reset.scss +++ b/gui/src/assets/scss/reset.scss @@ -35,7 +35,7 @@ code { } html{ - @media screen and (max-width: 1024px) { + @media screen and (max-width: 1400px) { font-size:0.9em; @media screen and (max-width: 767px) { font-size:0.8em; diff --git a/gui/src/plugins/i18n.js b/gui/src/plugins/i18n.js index 96cd4a73..9b969701 100644 --- a/gui/src/plugins/i18n.js +++ b/gui/src/plugins/i18n.js @@ -9,9 +9,7 @@ Vue.use(VueI18n); // Create VueI18n instance with options let locale = "zh"; for (let l of window.navigator.languages) { - if (l.toLowerCase() === "zh-cn") { - l = "zh"; - } + l = l.split("-")[0]; if (l in messages) { locale = l; }