This commit is contained in:
2020-02-05 19:43:41 +00:00
parent 04699a3e19
commit 9430d06fd1
6 changed files with 89 additions and 5 deletions

View File

@@ -785,7 +785,8 @@ export default function initialize() {
shortDate: "YYYY-MM-DD",
shortTime: "hh:mm:ss A",
shortDateAndTime: "YYYY-MM-DD hh:mm:ss A",
timeZoneOffset: res.data.timeZoneOffset
timeZoneOffset: res.data.timeZoneOffset,
tag: res.data.tag || "en-US"
});
resolve();

View File

@@ -190,5 +190,55 @@ export default {
ret = ret.replace(foundMatch, newValue);
}
return ret;
},
////////////////////////////////////////////////////////
// attempt to determine user's preferred first browser language setting
// https://stackoverflow.com/a/46514247/8939
//
//
getFirstBrowserLanguage() {
var nav = window.navigator,
browserLanguagePropertyKeys = [
"language",
"browserLanguage",
"systemLanguage",
"userLanguage"
],
i,
language,
len,
shortLanguage = null;
// support for HTML 5.1 "navigator.languages"
if (Array.isArray(nav.languages)) {
for (i = 0; i < nav.languages.length; i++) {
language = nav.languages[i];
len = language.length;
if (!shortLanguage && len) {
shortLanguage = language;
}
if (language && len > 2) {
return language;
}
}
}
// support for other well known properties in browsers
for (i = 0; i < browserLanguagePropertyKeys.length; i++) {
language = nav[browserLanguagePropertyKeys[i]];
//skip this loop iteration if property is null/undefined. IE11 fix.
if (language == null) {
continue;
}
len = language.length;
if (!shortLanguage && len) {
shortLanguage = language;
}
if (language && len > 2) {
return language;
}
}
return shortLanguage;
}
};

View File

@@ -21,6 +21,7 @@ export default new Vuex.Store({
homePage: undefined,
localeText: {},
locale: {
tag: "en-US",
decimalSeparator: ".",
currencySymbol: "$",
shortDate: "YYYY-MM-DD",
@@ -56,6 +57,7 @@ export default new Vuex.Store({
state.localeText = {};
state.formCustomTemplate = {};
state.apiUrl = "";
state.locale.tag = "en-US";
state.locale.decimalSeparator = ".";
state.locale.currencySymbol = "$";
state.locale.shortDate = "YYYY-MM-DD";
@@ -82,6 +84,7 @@ export default new Vuex.Store({
state.locale.shortTime = data.shortTime;
state.locale.shortDateAndTime = data.shortDateAndTime;
state.locale.timeZoneOffset = data.timeZoneOffset;
state.locale.tag = data.tag;
},
setAPIURL(state, data) {
state.apiUrl = data;

View File

@@ -24,6 +24,13 @@
<span class="body-2">{{ this.$store.state.userName }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("Language") }}:</span>
<span class="body-2">
{{ ltFormat().tag }}
</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("UserTimeZoneOffset") }}:</span>
<span class="body-2">

View File

@@ -1,14 +1,20 @@
<template>
<UnderConstruction />
<div>
User's preferred language:
{{ userLanguage }}
</div>
</template>
<script>
import UnderConstruction from "../components/underconstruction.vue";
export default {
components: {
UnderConstruction
data() {
return {
userLanguage: window.$gz.locale.getFirstBrowserLanguage()
};
},
components: {},
beforeCreate() {
window.$gz.eventBus.$emit("menu-change", {
isMain: true,