diff --git a/assets/src/i18n/index.js b/assets/src/i18n/index.js index ba55e6a2..004ca241 100644 --- a/assets/src/i18n/index.js +++ b/assets/src/i18n/index.js @@ -11,31 +11,33 @@ Vue.use(VueI18n) let locale = (navigator.language || navigator.browserLangugae).toLowerCase() switch (true) { - case /en.*/i.test(locale): + case /^en.*/i.test(locale): locale = 'en' break - case /fr.*/i.test(locale): + case /^fr.*/i.test(locale): locale = 'fr' break - case /pt.*/i.test(locale): + case /^pt.*/i.test(locale): locale = 'pr' break - case /ja.*/i.test(locale): + case /^ja.*/i.test(locale): locale = 'ja' break - case /zh_CN/i.test(locale): + case /^zh-CN/i.test(locale): locale = 'zh-cn' break - case /zh_TW/i.test(locale): + case /^zh-TW/i.test(locale): locale = 'zh-tw' break - case /zh.*/i.test(locale): + case /^zh.*/i.test(locale): locale = 'zh-cn' break default: locale = 'en' } +console.log(locale) + const i18n = new VueI18n({ locale: locale, fallbackLocale: 'en', diff --git a/assets/src/store/mutations.js b/assets/src/store/mutations.js index 88726d68..881850ee 100644 --- a/assets/src/store/mutations.js +++ b/assets/src/store/mutations.js @@ -29,25 +29,25 @@ const mutations = { setUser: (state, value) => { let locale = (value.locale || navigator.language || navigator.browserLangugae).toLowerCase() switch (true) { - case /en.*/i.test(locale): + case /^en.*/i.test(locale): locale = 'en' break - case /fr.*/i.test(locale): + case /^fr.*/i.test(locale): locale = 'fr' break - case /pt.*/i.test(locale): + case /^pt.*/i.test(locale): locale = 'pr' break - case /ja.*/i.test(locale): + case /^ja.*/i.test(locale): locale = 'ja' break - case /zh_CN/i.test(locale): + case /^zh-CN/i.test(locale): locale = 'zh-cn' break - case /zh_TW/i.test(locale): + case /^zh-TW/i.test(locale): locale = 'zh-tw' break - case /zh.*/i.test(locale): + case /^zh.*/i.test(locale): locale = 'zh-cn' break default: