This commit is contained in:
2021-03-19 17:01:40 +00:00
parent ae68ec0695
commit ef8279ec9f
27 changed files with 156 additions and 70 deletions

View File

@@ -337,7 +337,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="optionsObj.languageOverride"
:placeholder="locale().getBrowserFirstLanguage()"
:placeholder="locale().getResolvedLanguage()"
:readonly="formState.readOnly"
:label="$ay.t('LanguageCode')"
:error-messages="

View File

@@ -29,7 +29,7 @@
<div>
<span class="ml-6 body-1">{{ $ay.t("LanguageCode") }}: </span>
<span class="body-2">{{ locale().getBrowserFirstLanguage() }}</span>
<span class="body-2">{{ locale().getResolvedLanguage() }}</span>
</div>
<div>

View File

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

View File

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

View File

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

View File

@@ -327,7 +327,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="optionsObj.languageOverride"
:placeholder="locale().getBrowserFirstLanguage()"
:placeholder="locale().getResolvedLanguage()"
:readonly="formState.readOnly"
:label="$ay.t('LanguageCode')"
:error-messages="

View File

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

View File

@@ -128,24 +128,26 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="obj.languageOverride"
:placeholder="locale().getBrowserFirstLanguage()"
:readonly="formState.readOnly"
:label="$ay.t('LanguageCode')"
:error-messages="form().serverErrors(this, 'languageOverride')"
ref="languageOverride"
@input="fieldValueChanged('languageOverride')"
:hint="locale().getResolvedLanguage()"
persistent-hint
></v-text-field>
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
v-model="obj.timeZoneOverride"
:placeholder="locale().getResolvedTimeZoneName()"
:readonly="formState.readOnly"
:label="$ay.t('TimeZone')"
:error-messages="form().serverErrors(this, 'timeZoneOverride')"
ref="timeZoneOverride"
@input="fieldValueChanged('timeZoneOverride')"
:hint="locale().getResolvedTimeZoneName()"
persistent-hint
></v-text-field>
</v-col>

View File

@@ -949,7 +949,7 @@ export default {
ayaType: window.$gz.type.PurchaseOrder,
currencyName: window.$gz.locale.getCurrencyName(),
timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
languageName: window.$gz.locale.getBrowserLanguages(),
languageName: window.$gz.locale.getResolvedLanguage(),
hour12: window.$gz.locale.getHour12()
};
},

View File

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

View File

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

View File

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