This commit is contained in:
2021-02-02 20:47:02 +00:00
parent f78d0f9532
commit c1b6c5e336
24 changed files with 63 additions and 35 deletions

View File

@@ -351,7 +351,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="optionsObj.timeZoneOverride"
:placeholder="locale().getBrowserTimeZoneName()"
:placeholder="locale().getResolvedTimeZoneName()"
:readonly="formState.readOnly"
:label="$ay.t('TimeZone')"
:error-messages="

View File

@@ -23,7 +23,7 @@
<div>
<span class="ml-6 body-1">{{ $ay.t("TimeZone") }}: </span>
<span class="body-2">
{{ locale().getBrowserTimeZoneName() }}
{{ locale().getResolvedTimeZoneName() }}
</span>
</div>

View File

@@ -292,7 +292,7 @@ export default {
vm.name = res.data.name;
let temp = res.data.events;
let currentEventCount = vm.obj.length;
let timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
let timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
let languageName = window.$gz.locale.getBrowserLanguages();
let hour12 = window.$gz.store.state.userOptions.hour12;
for (let i = 0; i < temp.length; i++) {

View File

@@ -914,7 +914,7 @@ Handlebars.registerHelper('loud', function (aString) {
// {
// UserName: vm.$store.state.userName,
// Authorization: "Bearer " + window.$gz.store.state.apiToken, //api token for using api methods as current user viewing report
// TimeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
// TimeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
// LanguageName: window.$gz.locale.getBrowserLanguages(),
// Hour12: window.$gz.locale.getHour12(),
// CurrencyName: window.$gz.locale.getCurrencyName(),

View File

@@ -875,7 +875,7 @@ export default {
headers: [],
selected: [],
availableRoles: [],
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12()
};

View File

@@ -779,7 +779,7 @@ export default {
headers: [],
selected: [],
availableRoles: [],
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12()
};

View File

@@ -341,7 +341,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="optionsObj.timeZoneOverride"
:placeholder="locale().getBrowserTimeZoneName()"
:placeholder="locale().getResolvedTimeZoneName()"
:readonly="formState.readOnly"
:label="$ay.t('TimeZone')"
:error-messages="

View File

@@ -167,7 +167,7 @@ export default {
// );
// let dtPrecipice = dtToday.plus({ days: -85 }).toUTC();
let timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
let timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
let languageName = window.$gz.locale.getBrowserLanguages();
let hour12 = window.$gz.store.state.userOptions.hour12;
for (let i = 0; i < temp.length; i++) {

View File

@@ -140,7 +140,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="obj.timeZoneOverride"
:placeholder="locale().getBrowserTimeZoneName()"
:placeholder="locale().getResolvedTimeZoneName()"
:readonly="formState.readOnly"
:label="$ay.t('TimeZone')"
:error-messages="form().serverErrors(this, 'timeZoneOverride')"

View File

@@ -157,7 +157,7 @@ export default {
},
rights: window.$gz.role.fullRightsObject(),
//cache display format stuff
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12()
};

View File

@@ -64,7 +64,7 @@ export default {
},
rights: window.$gz.role.defaultRightsObject(),
//cache display format stuff
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12()
};

View File

@@ -67,7 +67,7 @@ export default {
rights: window.$gz.role.defaultRightsObject(),
//cache display format stuff
timeZoneName: window.$gz.locale.getBrowserTimeZoneName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
hour12: window.$gz.locale.getHour12()
};