This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user