This commit is contained in:
2020-03-05 20:14:17 +00:00
parent 9deb0d066c
commit 85e66d17df
9 changed files with 42 additions and 15 deletions

View File

@@ -45,10 +45,9 @@ CURRENT TODOs
@@@@@@@@@@@ ROADMAP STAGE 1 and 2:
todo: add set loginpassword option to menu in usersettings form
todo: modify locale object to use overrides for language, timezone
todo: User settings documentation
todo: User settings && password change documentation
- do it now?
- needs section explaining about how locale is displayed so can link to it from other places
- is that it's own page? (maybe because each subject should be short and focused and look clean with lots of whitespace, clear large text)

View File

@@ -745,6 +745,34 @@ export default function initialize() {
);
window.$gz.eventBus.$emit("notify-error", msg);
} else {
//Check if overrides and use them here
//or else use browser defaults
//locale().getBrowserFirstLanguage()
//locale().getBrowserTimeZoneName()
/*
concurrencyToken: 7478681
currencyName: "USD"
emailAddress: null
hour12: true
id: 1
languageOverride: null
timeZoneOverride: null
uiColor: "#000000"
userId: 1
*/
window.$gz.store.commit("setLocale", {
languageOverride: "en-US",
timeZoneOverride: "America/New_York",

View File

@@ -199,7 +199,7 @@ export default {
// Get users default time zone
//https://www.iana.org/time-zones
//https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
getTimeZoneName() {
getBrowserTimeZoneName() {
return Intl.DateTimeFormat().resolvedOptions().timeZone;
},
//////////////////////////////////////////////////
@@ -229,7 +229,7 @@ export default {
return "";
}
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
if (!languageName) {
languageName = this.getBrowserLanguages();
@@ -262,7 +262,7 @@ export default {
return "";
}
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
if (!languageName) {
languageName = this.getBrowserLanguages();
@@ -289,7 +289,7 @@ export default {
return "";
}
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
if (!languageName) {
languageName = this.getBrowserLanguages();
@@ -327,7 +327,7 @@ export default {
//also fr-CA does as well as possibly en-CA
//https://stackoverflow.com/a/58633686/8939
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
return new Date(value).toLocaleTimeString("sv-SE", {
timeZone: timeZoneName
@@ -342,7 +342,7 @@ export default {
localTimeDateStringToUTC8601String(value, timeZoneName) {
//https://moment.github.io/luxon/docs/manual/zones.html#creating-datetimes-in-a-zone
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
//parse in the time in the currently used timezone
return window.$gz.DateTime.fromISO(value, {
@@ -365,7 +365,7 @@ export default {
//also fr-CA does as well as possibly en-CA
//https://stackoverflow.com/a/58633686/8939
if (!timeZoneName) {
timeZoneName = this.getTimeZoneName();
timeZoneName = this.getBrowserTimeZoneName();
}
return new Date(value).toLocaleDateString("sv-SE", {
timeZone: timeZoneName

View File

@@ -45,7 +45,7 @@ export default {
oldDate: null,
dlgdate: false,
//cache display format stuff
timeZoneName: window.$gz.locale.getTimeZoneName(),
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0]
}),

View File

@@ -85,7 +85,7 @@ export default {
dlgdate: false,
dlgtime: false,
//cache display format stuff
timeZoneName: window.$gz.locale.getTimeZoneName(),
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12(),
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0]

View File

@@ -602,7 +602,7 @@ function buildRecords(listData, columndefinitions) {
}
//cache display format stuff
var timeZoneName = window.$gz.locale.getTimeZoneName();
var timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
var languageName = window.$gz.locale.getBrowserLanguages();
var hour12 = window.$gz.store.state.locale.hour12;
var currencyName = window.$gz.store.state.locale.currencyName;

View File

@@ -49,7 +49,7 @@ export default {
oldDate: null,
dlgtime: false,
//cache display format stuff
timeZoneName: window.$gz.locale.getTimeZoneName(),
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12(),
defaultLocale: window.$gz.locale.getBrowserFirstLanguage().split("-", 1)[0]

View File

@@ -34,7 +34,7 @@
<div>
<span class="ml-6 body-1">{{ lt("TimeZone") }}: </span>
<span class="body-2">
{{ locale().getTimeZoneName() }}
{{ locale().getBrowserTimeZoneName() }}
</span>
</div>

View File

@@ -62,7 +62,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="obj.timeZoneOverride"
:placeholder="locale().getTimeZoneName()"
:placeholder="locale().getBrowserTimeZoneName()"
:readonly="formState.readOnly"
clearable
@click:clear="onChange('timeZoneOverride')"