This commit is contained in:
2020-03-06 20:41:05 +00:00
parent 1d874d8d1f
commit 12ff2b6e41
13 changed files with 290 additions and 293 deletions

View File

@@ -27,27 +27,25 @@
<div>
<span class="ml-6 body-1">12h: </span>
<span class="body-2">
{{ translation().getHour12() }}
{{ locale().getHour12() }}
</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("TimeZone") }}: </span>
<span class="body-2">
{{ translation().getBrowserTimeZoneName() }}
{{ locale().getBrowserTimeZoneName() }}
</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("LanguageCode") }}: </span>
<span class="body-2">{{
translation().getBrowserFirstLanguage()
}}</span>
<span class="body-2">{{ locale().getBrowserFirstLanguage() }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("CurrencyCode") }}: </span>
<span class="body-2">{{ translation().getCurrencyName() }}</span>
<span class="body-2">{{ locale().getCurrencyName() }}</span>
</div>
<v-divider class="mt-6"></v-divider>
@@ -173,6 +171,9 @@ export default {
},
translation() {
return window.$gz.translation;
},
locale() {
return window.$gz.locale;
}
}
};

View File

@@ -1462,15 +1462,15 @@ function getDisplayForFilter(
var valueDisplay = "selected value";
switch (uiFieldDataType) {
case 1: //date translate
valueDisplay = window.$gz.translation.utcDateToShortDateAndTimeLocalized(
valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
filterValue
);
break;
case 8: //currency translate
valueDisplay = window.$gz.translation.currencyLocalized(filterValue);
valueDisplay = window.$gz.locale.currencyLocalized(filterValue);
break;
case 7: //decimal translate
valueDisplay = window.$gz.translation.decimalLocalized(filterValue);
valueDisplay = window.$gz.locale.decimalLocalized(filterValue);
break;
case 6: //BOOL translate
//debugger;

View File

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