renamed lt function to t as it's no longer localized text and t is shorter, also renamed parameter ltKey to tKey for similar reasons

This commit is contained in:
2020-03-27 19:45:37 +00:00
parent cb21d9ece9
commit e548ecb12f
18 changed files with 222 additions and 223 deletions

View File

@@ -173,8 +173,8 @@ export default {
var match;
while ((match = pattern.exec(s)) != null) {
var foundMatch = match[0];
var ltKey = match[1];
var newValue = this.get(ltKey);
var tKey = match[1];
var newValue = this.get(tKey);
ret = ret.replace(foundMatch, newValue);
}
return ret;

View File

@@ -47,9 +47,6 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
},
translation() {
return window.$gz.translation;
},

View File

@@ -1,7 +1,7 @@
<template>
<div v-if="templateHasVisibleCustomFields()">
<span class="v-label v-label--active theme--light">
{{ lt("ObjectCustomFieldCustomGrid") }}
{{ t("ObjectCustomFieldCustomGrid") }}
</span>
<div>
<v-row align-center justify-left row wrap>
@@ -20,11 +20,11 @@
<gz-date-time-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></gz-date-time-picker>
</div>
@@ -34,11 +34,11 @@
<gz-date-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></gz-date-picker>
</div>
@@ -47,11 +47,11 @@
<gz-time-picker
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></gz-time-picker>
</div>
@@ -60,11 +60,11 @@
<v-textarea
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
auto-grow
clearable
@@ -75,11 +75,11 @@
<v-text-field
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
clearable
:counter="10"
@@ -92,11 +92,11 @@
<v-checkbox
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></v-checkbox>
</div>
@@ -105,11 +105,11 @@
<gz-decimal
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></gz-decimal>
</div>
@@ -118,11 +118,11 @@
<gz-currency
v-model="_self[item.dataKey]"
:readonly="readOnly"
:label="lt(item.fld)"
:label="t(item.fld)"
:ref="item.fld"
:error-messages="form().serverErrors(parentVM, item.fld)"
:rules="[
form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
form().customFieldsCheck(parentVM, item, _self, t(item.fld))
]"
></gz-currency>
</div>
@@ -158,7 +158,7 @@ export default {
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
form() {

View File

@@ -18,7 +18,7 @@
<v-date-picker :locale="defaultLocale" v-model="dateOnly">
<v-spacer></v-spacer>
<v-btn text color="primary" @click="dlgdate = false">{{
lt("OK")
t("OK")
}}</v-btn>
</v-date-picker>
</v-dialog>
@@ -60,8 +60,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
}
},
watch: {

View File

@@ -27,7 +27,7 @@
>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="dlgdate = false">{{
lt("OK")
t("OK")
}}</v-btn>
</v-date-picker>
</v-dialog>
@@ -58,7 +58,7 @@
>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="dlgtime = false">{{
lt("OK")
t("OK")
}}</v-btn>
</v-time-picker>
</v-dialog>
@@ -101,8 +101,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
}
},
watch: {

View File

@@ -47,9 +47,6 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
},
translation() {
return window.$gz.translation;
},

View File

@@ -17,7 +17,7 @@
:items="selectLists.listViews"
item-text="name"
item-value="id"
:label="lt('DataListView')"
:label="t('DataListView')"
@input="listViewChanged"
>
</v-select>
@@ -36,7 +36,7 @@
class="headline ml-3 accent--text"
v-if="!loading && records.length < 1"
>
{{ lt("NoData") }}
{{ t("NoData") }}
</div>
<!-- WIDE TABLE VIEW -->
<template v-if="$vuetify.breakpoint.smAndUp">
@@ -54,11 +54,11 @@
showCurrentPage: true,
showFirstLastPage: true,
itemsPerPageOptions: rowsPerPageItems,
itemsPerPageText: lt('RowsPerPage'),
pageText: lt('PageOfPageText')
itemsPerPageText: t('RowsPerPage'),
pageText: t('PageOfPageText')
}"
:loading-text="lt('Loading')"
:no-data-text="lt('NoData')"
:loading-text="t('Loading')"
:no-data-text="t('NoData')"
class="elevation-1"
>
<template v-slot:body="{ items }">
@@ -171,14 +171,14 @@
showCurrentPage: true,
showFirstLastPage: true,
itemsPerPageOptions: rowsPerPageItems,
itemsPerPageText: lt('RowsPerPage'),
pageText: lt('PageOfPageText')
itemsPerPageText: t('RowsPerPage'),
pageText: t('PageOfPageText')
}"
:loading-text="lt('Loading')"
:loading-text="t('Loading')"
class="elevation-1"
>
<template v-slot:header="props">
<!-- Mimic the full width data table select all toggle :no-data-text="lt('NoData')"-->
<!-- Mimic the full width data table select all toggle :no-data-text="t('NoData')"-->
<div
id="divSelectAll"
@click="props.toggleSelectAll(!props.everyItem)"
@@ -489,8 +489,8 @@ export default {
//i is the actual AyaNova index of vm record so we have all we need to open vm object
window.$gz.eventBus.$emit("openobject", { type: typeToOpen, id: i });
},
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
},
getDataFromApi() {
var vm = this;
@@ -856,7 +856,7 @@ function loadFormSettings(vm) {
//add UNSAVED FILTER if -1
vm.selectLists.listViews.unshift({
name: vm.lt("FilterUnsaved"),
name: vm.t("FilterUnsaved"),
id: -1
});

View File

@@ -11,7 +11,7 @@
item-disabled="!active"
:error-messages="errors"
:loading="fetching"
:placeholder="lt('Search')"
:placeholder="t('Search')"
:search-input.sync="searchEntry"
:filter="customFilter"
hide-no-data
@@ -107,7 +107,7 @@ export default {
}
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
hasError: function() {
@@ -283,7 +283,7 @@ export default {
if (val.includes(" ")) {
queryTerms = val.split(" ");
if (queryTerms.length > 2) {
vm.errors.push(vm.lt("ErrorPickListQueryInvalid"));
vm.errors.push(vm.t("ErrorPickListQueryInvalid"));
return;
}
isATwoTermQuery = true;
@@ -318,7 +318,7 @@ export default {
window.$gz._.startsWith(queryTerms[0], "..") &&
window.$gz._.startsWith(queryTerms[1], "..")
) {
vm.errors.push(vm.lt("ErrorPickListQueryInvalid"));
vm.errors.push(vm.t("ErrorPickListQueryInvalid"));
return;
}
@@ -327,7 +327,7 @@ export default {
!window.$gz._.startsWith(queryTerms[0], "..") &&
!window.$gz._.startsWith(queryTerms[1], "..")
) {
vm.errors.push(vm.lt("ErrorPickListQueryInvalid"));
vm.errors.push(vm.t("ErrorPickListQueryInvalid"));
return;
}
}

View File

@@ -1,15 +1,15 @@
<template>
<div>
<span class="v-label v-label--active theme--light">
{{ lt("Tags") }}
{{ t("Tags") }}
</span>
<v-autocomplete
v-bind:value="value"
v-on:input="$emit('input', $event)"
:items="sourcetags"
:loading="tagSearchUnderway"
:placeholder="lt('TypeToSearchOrAdd')"
:no-data-text="lt('NoData')"
:placeholder="t('TypeToSearchOrAdd')"
:no-data-text="t('NoData')"
:search-input.sync="tagSearchEntry"
hide-selected
multiple
@@ -95,7 +95,7 @@ export default {
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
addTag() {

View File

@@ -22,7 +22,7 @@
>
<v-spacer></v-spacer>
<v-btn text color="primary" @click="dlgtime = false">{{
lt("OK")
t("OK")
}}</v-btn>
</v-time-picker>
</v-dialog>
@@ -65,8 +65,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
}
},
watch: {

View File

@@ -1,14 +1,22 @@
<template>
<UnderConstruction />
<v-card class="mx-auto">
<v-list subheader>
<v-subheader>General</v-subheader>
<v-list-item>
<v-list-item-icon>
<v-icon>fa-home</v-icon>
</v-list-item-icon>
<v-list-item-title>Home</v-list-item-title>
</v-list-item>
</v-list>
</v-card>
</template>
<script>
import UnderConstruction from "../components/underconstruction.vue";
export default {
components: {
UnderConstruction
},
beforeCreate() {
window.$gz.eventBus.$emit("menu-change", {
isMain: true,

View File

@@ -14,13 +14,13 @@
</v-col>
<v-col>
<v-card id="ayaNovaVersioncard">
<v-subheader>{{ lt("ClientApp") }}</v-subheader>
<v-subheader>{{ t("ClientApp") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ lt("Version") }}: </span>
<span class="ml-6 body-1">{{ t("Version") }}: </span>
<span class="body-2">{{ clientInfo.version }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("User") }}: </span>
<span class="ml-6 body-1">{{ t("User") }}: </span>
<span class="body-2">{{ this.$store.state.userName }}</span>
</div>
@@ -32,83 +32,83 @@
</div>
<div>
<span class="ml-6 body-1">{{ lt("TimeZone") }}: </span>
<span class="ml-6 body-1">{{ t("TimeZone") }}: </span>
<span class="body-2">
{{ locale().getBrowserTimeZoneName() }}
</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("LanguageCode") }}: </span>
<span class="ml-6 body-1">{{ t("LanguageCode") }}: </span>
<span class="body-2">{{ locale().getBrowserFirstLanguage() }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("CurrencyCode") }}: </span>
<span class="ml-6 body-1">{{ t("CurrencyCode") }}: </span>
<span class="body-2">{{ locale().getCurrencyName() }}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ lt("Browser") }}</v-subheader>
<v-subheader>{{ t("Browser") }}</v-subheader>
<div v-for="(value, name) in browser" :key="name">
<span class="ml-6 body-1">{{ name }}: </span>
<span class="body-2">{{ value }}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ lt("Server") }}</v-subheader>
<v-subheader>{{ t("Server") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ lt("ServerAddress") }}: </span>
<span class="ml-6 body-1">{{ t("ServerAddress") }}: </span>
<span class="body-2">{{ this.$store.state.apiUrl }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("Version") }}: </span>
<span class="ml-6 body-1">{{ t("Version") }}: </span>
<span class="body-2">{{ serverInfo.serverVersion }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("SchemaVersion") }}: </span>
<span class="ml-6 body-1">{{ t("SchemaVersion") }}: </span>
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("ServerTime") }}: </span>
<span class="ml-6 body-1">{{ t("ServerTime") }}: </span>
<span class="body-2">{{ serverInfo.serverLocalTime }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("TimeZone") }}: </span>
<span class="ml-6 body-1">{{ t("TimeZone") }}: </span>
<span class="body-2">{{ serverInfo.serverTimeZone }}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ lt("HelpLicense") }}</v-subheader>
<v-subheader>{{ t("HelpLicense") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ lt("RegisteredUser") }}: </span>
<span class="ml-6 body-1">{{ t("RegisteredUser") }}: </span>
<span class="body-2">{{
serverInfo.license.license.licensedTo
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("DatabaseID") }}: </span>
<span class="ml-6 body-1">{{ t("DatabaseID") }}: </span>
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("LicenseSerial") }}: </span>
<span class="ml-6 body-1">{{ t("LicenseSerial") }}: </span>
<span class="body-2">{{ serverInfo.license.license.keySerial }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("LicenseExpiration") }}: </span>
<span class="ml-6 body-1">{{ t("LicenseExpiration") }}: </span>
<span class="body-2">{{
serverInfo.license.license.licenseExpiration
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ lt("SupportedUntil") }}: </span>
<span class="ml-6 body-1">{{ t("SupportedUntil") }}: </span>
<span class="body-2">{{
serverInfo.license.license.maintenanceExpiration
}}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ lt("LicensedOptions") }}</v-subheader>
<v-subheader>{{ t("LicensedOptions") }}</v-subheader>
<div
v-for="item in serverInfo.license.license.features"
@@ -166,8 +166,8 @@ export default {
};
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;

View File

@@ -30,7 +30,7 @@
<v-checkbox
v-model="item.visible"
:readOnly="formState.readOnly"
:label="lt('FormFieldVisible')"
:label="t('FormFieldVisible')"
:ref="item.key"
:disabled="item.stockRequired"
@change="visibleChanged(item)"
@@ -38,7 +38,7 @@
<v-checkbox
v-model="item.required"
:readOnly="formState.readOnly"
:label="lt('FormFieldEntryRequired')"
:label="t('FormFieldEntryRequired')"
:disabled="item.stockRequired"
@change="requiredChanged(item)"
></v-checkbox>
@@ -49,7 +49,7 @@
:items="selectLists.uiFieldDataTypes"
item-text="name"
item-value="id"
:label="lt('UiFieldDataType')"
:label="t('UiFieldDataType')"
@input="dataTypeChanged(item)"
></v-select>
<!-- <v-divider></v-divider>
@@ -133,7 +133,7 @@ export default {
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
visibleChanged: function(item) {
@@ -353,14 +353,14 @@ function fetchTranslatedText(vm) {
function populateSelectionLists(vm) {
vm.selectLists.uiFieldDataTypes.push(
...[
{ name: vm.lt("UiFieldDataTypesDateTime"), id: 1 },
{ name: vm.lt("UiFieldDataTypesDateOnly"), id: 2 },
{ name: vm.lt("UiFieldDataTypesTimeOnly"), id: 3 },
{ name: vm.lt("UiFieldDataTypesText"), id: 4 },
{ name: vm.lt("UiFieldDataTypesTrueFalse"), id: 6 },
{ name: vm.lt("UiFieldDataTypesInteger"), id: 5 },
{ name: vm.lt("UiFieldDataTypesDecimal"), id: 7 },
{ name: vm.lt("UiFieldDataTypesCurrency"), id: 8 }
{ name: vm.t("UiFieldDataTypesDateTime"), id: 1 },
{ name: vm.t("UiFieldDataTypesDateOnly"), id: 2 },
{ name: vm.t("UiFieldDataTypesTimeOnly"), id: 3 },
{ name: vm.t("UiFieldDataTypesText"), id: 4 },
{ name: vm.t("UiFieldDataTypesTrueFalse"), id: 6 },
{ name: vm.t("UiFieldDataTypesInteger"), id: 5 },
{ name: vm.t("UiFieldDataTypesDecimal"), id: 7 },
{ name: vm.t("UiFieldDataTypesCurrency"), id: 8 }
]
);
}
@@ -412,7 +412,7 @@ function initDataObject(vm) {
var objItem = {
key: faf.fieldKey,
title: window.$gz.translation.get(faf.ltKey),
title: window.$gz.translation.get(faf.tKey),
stockRequired: !faf.hideable,
custom: faf.isCustomField,
required: faf.hideable === false || templateItem.required === true,

View File

@@ -39,7 +39,7 @@
clearable
@click:clear="fieldValueChanged('name')"
:counter="255"
:label="lt('Name')"
:label="t('Name')"
:rules="[
form().max255(this, 'name'),
form().required(this, 'name')
@@ -53,7 +53,7 @@
<v-checkbox
v-model="obj.public"
:readonly="this.formState.readOnly"
:label="lt('AnyUser')"
:label="t('AnyUser')"
ref="public"
@change="fieldValueChanged('public')"
></v-checkbox>
@@ -72,7 +72,7 @@
<v-switch
v-if="!item.rid"
v-model="item.include"
:label="lt('Include')"
:label="t('Include')"
:ref="item.key"
:disabled="
item.sort != null || item.filter.items.length > 0
@@ -80,7 +80,7 @@
@change="includeChanged(item)"
></v-switch>
<div v-if="item.rid" class="v-label mb-8 mt-6">
{{ lt("Include") }}
{{ t("Include") }}
</div>
<!-- RE-ORDER CONTROL -->
<div class="d-flex justify-space-between">
@@ -120,7 +120,7 @@
></v-btn
>
<label class="v-label theme--light"
>&nbsp;{{ lt("Sort") }}</label
>&nbsp;{{ t("Sort") }}</label
>
</div>
</template>
@@ -136,7 +136,7 @@
:items="selectLists.dateFilterTokens"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<div v-if="item.tempFilterToken == '*select*'">
@@ -176,7 +176,7 @@
:items="selectLists.stringFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-text-field
@@ -204,7 +204,7 @@
:items="selectLists.integerFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-text-field
@@ -232,7 +232,7 @@
:items="selectLists.boolFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<v-radio-group
@@ -245,13 +245,10 @@
row
>
<v-radio
:label="lt('False')"
:label="t('False')"
:value="false"
></v-radio>
<v-radio
:label="lt('True')"
:value="true"
></v-radio>
<v-radio :label="t('True')" :value="true"></v-radio>
</v-radio-group>
<v-btn
@@ -270,7 +267,7 @@
:items="selectLists.decimalFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<gz-decimal
@@ -297,7 +294,7 @@
:items="selectLists.decimalFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
<gz-currency
@@ -324,7 +321,7 @@
:items="selectLists.tagFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
@@ -348,7 +345,7 @@
:items="selectLists.enumFilterOperators"
item-text="name"
item-value="id"
:label="lt('Filter')"
:label="t('Filter')"
prepend-icon="fa-filter"
></v-select>
@@ -382,11 +379,11 @@
<!-- AND / OR FILTER CONDITIONS -->
<v-radio-group v-model="item.filter.any" row>
<v-radio
:label="lt('GridFilterDialogAndRadioText')"
:label="t('GridFilterDialogAndRadioText')"
:value="false"
></v-radio>
<v-radio
:label="lt('GridFilterDialogOrRadioText')"
:label="t('GridFilterDialogOrRadioText')"
:value="true"
></v-radio> </v-radio-group
></v-subheader>
@@ -558,7 +555,7 @@ export default {
}
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
enumSelectionList: function(enumKey) {
@@ -704,7 +701,7 @@ export default {
// //switch to unsaved listview if not already
// if (this.listViewId != -1) {
// this.listViewId = -1;
// vm.obj.name = vm.lt("FilterUnsaved");
// vm.obj.name = vm.t("FilterUnsaved");
// }
// },
fieldValueChanged(ref) {
@@ -717,7 +714,7 @@ export default {
var vm = this;
//check that "unsaved filter" is not the name
//if it is, set it empty and force user to set a name
if (vm.obj.name == vm.lt("FilterUnsaved")) {
if (vm.obj.name == vm.t("FilterUnsaved")) {
vm.obj.name = "";
return;
}
@@ -1052,143 +1049,143 @@ function fetchTranslatedText(vm) {
function populateSelectionLists(vm) {
vm.selectLists.dateFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownGreaterThan"), id: ">" },
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownGreaterThan"), id: ">" },
{
name: vm.lt("GridRowFilterDropDownGreaterThanOrEqualTo"),
name: vm.t("GridRowFilterDropDownGreaterThanOrEqualTo"),
id: ">="
},
{ name: vm.lt("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.lt("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" }
{ name: vm.t("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" }
]
);
vm.selectLists.dateFilterTokens.push(
...[
{ name: "(" + vm.lt("SelectItem") + ")", id: "*select*" }, //If select then use entry in date /time picker
{ name: vm.lt("DateRangeYesterday"), id: "*yesterday*" },
{ name: vm.lt("DateRangeToday"), id: "*today*" },
{ name: vm.lt("DateRangeTomorrow"), id: "*tomorrow*" },
{ name: vm.lt("DateRangeLastWeek"), id: "*lastweek*" },
{ name: vm.lt("DateRangeThisWeek"), id: "*thisweek*" },
{ name: vm.lt("DateRangeNextWeek"), id: "*nextweek*" },
{ name: vm.lt("DateRangeLastMonth"), id: "*lastmonth*" },
{ name: vm.lt("DateRangeThisMonth"), id: "*thismonth*" },
{ name: vm.lt("DateRangeNextMonth"), id: "*nextmonth*" },
{ name: vm.lt("DateRange14DayWindow"), id: "*14daywindow*" },
{ name: vm.lt("DateRangePast"), id: "*past*" },
{ name: vm.lt("DateRangeFuture"), id: "*future*" },
{ name: vm.lt("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec
{ name: vm.lt("DateRangeThisYear"), id: "*thisyear*" },
{ name: "(" + vm.t("SelectItem") + ")", id: "*select*" }, //If select then use entry in date /time picker
{ name: vm.t("DateRangeYesterday"), id: "*yesterday*" },
{ name: vm.t("DateRangeToday"), id: "*today*" },
{ name: vm.t("DateRangeTomorrow"), id: "*tomorrow*" },
{ name: vm.t("DateRangeLastWeek"), id: "*lastweek*" },
{ name: vm.t("DateRangeThisWeek"), id: "*thisweek*" },
{ name: vm.t("DateRangeNextWeek"), id: "*nextweek*" },
{ name: vm.t("DateRangeLastMonth"), id: "*lastmonth*" },
{ name: vm.t("DateRangeThisMonth"), id: "*thismonth*" },
{ name: vm.t("DateRangeNextMonth"), id: "*nextmonth*" },
{ name: vm.t("DateRange14DayWindow"), id: "*14daywindow*" },
{ name: vm.t("DateRangePast"), id: "*past*" },
{ name: vm.t("DateRangeFuture"), id: "*future*" },
{ name: vm.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec
{ name: vm.t("DateRangeThisYear"), id: "*thisyear*" },
{
name: vm.lt("DateRangeInTheLastThreeMonths"),
name: vm.t("DateRangeInTheLastThreeMonths"),
id: "*last3months*"
},
{
name: vm.lt("DateRangeInTheLastSixMonths"),
name: vm.t("DateRangeInTheLastSixMonths"),
id: "*last6months*"
},
{ name: vm.lt("DateRangePastYear"), id: "*pastyear*" }, //last 365 days
{ name: vm.t("DateRangePastYear"), id: "*pastyear*" }, //last 365 days
{ name: vm.lt("DateRangePast90Days"), id: "*past90days*" },
{ name: vm.lt("DateRangePast30Days"), id: "*past30days*" },
{ name: vm.lt("DateRangePast24Hours"), id: "*past24hours*" }
{ name: vm.t("DateRangePast90Days"), id: "*past90days*" },
{ name: vm.t("DateRangePast30Days"), id: "*past30days*" },
{ name: vm.t("DateRangePast24Hours"), id: "*past24hours*" }
]
);
vm.selectLists.stringFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownGreaterThan"), id: ">" },
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownGreaterThan"), id: ">" },
{
name: vm.lt("GridRowFilterDropDownGreaterThanOrEqualTo"),
name: vm.t("GridRowFilterDropDownGreaterThanOrEqualTo"),
id: ">="
},
{ name: vm.lt("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.lt("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" },
{ name: vm.lt("GridRowFilterDropDownDoesNotContain"), id: "!-%-" },
{ name: vm.lt("GridRowFilterDropDownContains"), id: "-%-" },
{ name: vm.lt("GridRowFilterDropDownStartsWith"), id: "%-" },
{ name: vm.lt("GridRowFilterDropDownEndsWith"), id: "-%" }
{ name: vm.t("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" },
{ name: vm.t("GridRowFilterDropDownDoesNotContain"), id: "!-%-" },
{ name: vm.t("GridRowFilterDropDownContains"), id: "-%-" },
{ name: vm.t("GridRowFilterDropDownStartsWith"), id: "%-" },
{ name: vm.t("GridRowFilterDropDownEndsWith"), id: "-%" }
]
);
vm.selectLists.integerFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownGreaterThan"), id: ">" },
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownGreaterThan"), id: ">" },
{
name: vm.lt("GridRowFilterDropDownGreaterThanOrEqualTo"),
name: vm.t("GridRowFilterDropDownGreaterThanOrEqualTo"),
id: ">="
},
{ name: vm.lt("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.lt("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" }
{ name: vm.t("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" }
]
);
vm.selectLists.boolFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" }
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" }
]
);
vm.selectLists.decimalFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownGreaterThan"), id: ">" },
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownGreaterThan"), id: ">" },
{
name: vm.lt("GridRowFilterDropDownGreaterThanOrEqualTo"),
name: vm.t("GridRowFilterDropDownGreaterThanOrEqualTo"),
id: ">="
},
{ name: vm.lt("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.lt("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" }
{ name: vm.t("GridRowFilterDropDownLessThan"), id: "<" },
{ name: vm.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" }
]
);
//tags filter only by equals in initial release, see DataListSqlFilterCriteriaBuilder.cs line 523 for deets
vm.selectLists.tagFilterOperators.push({
name: vm.lt("GridRowFilterDropDownEquals"),
name: vm.t("GridRowFilterDropDownEquals"),
id: "="
});
vm.selectLists.enumFilterOperators.push(
...[
{ name: vm.lt("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{ name: vm.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" },
{
name: vm.lt("GridRowFilterDropDownNonBlanksItem"),
name: vm.t("GridRowFilterDropDownNonBlanksItem"),
id: "*HASVALUE*"
},
{ name: vm.lt("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.lt("GridRowFilterDropDownNotEquals"), id: "!=" }
{ name: vm.t("GridRowFilterDropDownEquals"), id: "=" },
{ name: vm.t("GridRowFilterDropDownNotEquals"), id: "!=" }
]
);
}
@@ -1216,7 +1213,7 @@ function fetchTranslatedFieldNames(vm) {
var columnKeys = [];
for (var i = 1; i < vm.fieldDefinitions.length; i++) {
var cm = vm.fieldDefinitions[i];
columnKeys.push(cm.ltKey);
columnKeys.push(cm.tKey);
}
//Now fetch all the keys and await the response before returning
return window.$gz.translation.fetch(columnKeys).then(() => {
@@ -1248,7 +1245,7 @@ function setEffectiveListView(vm) {
vm.effectiveListView = JSON.parse(
formSettings.saved.dataTable.unsavedListView
);
vm.obj.name = vm.lt("FilterUnsaved");
vm.obj.name = vm.t("FilterUnsaved");
return Promise.resolve();
}
} else if (vm.listViewId == 0) {
@@ -1261,7 +1258,7 @@ function setEffectiveListView(vm) {
throw res.error;
} else {
vm.effectiveListView = JSON.parse(res.data);
vm.obj.name = vm.lt("FilterUnsaved");
vm.obj.name = vm.t("FilterUnsaved");
}
});
} else {
@@ -1299,7 +1296,7 @@ function initDataObject(vm) {
var fld = window.$gz._.find(vm.fieldDefinitions, ["fieldKey", lvItem.fld]);
var o = {
key: fld.fieldKey,
title: vm.lt(fld.ltKey),
title: vm.t(fld.tKey),
include: true,
isFilterable: fld.isFilterable,
isSortable: fld.isSortable,
@@ -1347,7 +1344,7 @@ function initDataObject(vm) {
//nope, so add it
var o = {
key: fld.fieldKey,
title: vm.lt(fld.ltKey),
title: vm.t(fld.tKey),
include: false,
isFilterable: fld.isFilterable,
isSortable: fld.isSortable,
@@ -1474,8 +1471,8 @@ function getDisplayForFilter(
break;
case 6: //BOOL translate
//debugger;
var ltKey = filterValue ? "True" : "False";
valueDisplay = vm.lt(ltKey);
var tKey = filterValue ? "True" : "False";
valueDisplay = vm.t(tKey);
break;
case 10: //ENUM translate
valueDisplay = window.$gz.enums.get(enumType, filterValue);

View File

@@ -3,7 +3,7 @@
<gz-pick-list
v-model="selectedWidget"
:ayaType="ayaType().Widget"
:label="lt('Widget')"
:label="t('Widget')"
:showEditIcon="true"
>
</gz-pick-list>
@@ -11,7 +11,7 @@
<gz-pick-list
v-model="selectedUser"
:ayaType="ayaType().User"
:label="lt('User')"
:label="t('User')"
>
</gz-pick-list>
<v-divider></v-divider>
@@ -52,7 +52,7 @@ export default {
};
},
methods: {
lt: function(ltkey) {
t: function(ltkey) {
return window.$gz.translation.get(ltkey);
},
ayaType: function() {

View File

@@ -29,7 +29,7 @@
autocapitalize="off"
spellcheck="false"
v-focus
:label="lt('UserLogin')"
:label="t('UserLogin')"
:rules="[form().required(this, 'loginName')]"
:error-messages="form().serverErrors(this, 'loginName')"
ref="loginName"
@@ -45,7 +45,7 @@
:readonly="formState.readOnly"
:append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
prepend-icon="fa-key"
:label="lt('OldPassword')"
:label="t('OldPassword')"
:type="reveal ? 'text' : 'password'"
:rules="[form().required(this, 'oldPassword')]"
:error-messages="form().serverErrors(this, 'oldPassword')"
@@ -61,7 +61,7 @@
:readonly="formState.readOnly"
:append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
prepend-icon="fa-key"
:label="lt('NewPassword')"
:label="t('NewPassword')"
:type="reveal ? 'text' : 'password'"
:rules="[form().required(this, 'newPassword')]"
:error-messages="form().serverErrors(this, 'newPassword')"
@@ -77,7 +77,7 @@
:readonly="formState.readOnly"
:append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
prepend-icon="fa-key"
:label="lt('ConfirmPassword')"
:label="t('ConfirmPassword')"
:type="reveal ? 'text' : 'password'"
:rules="[
form().required(this, 'confirmPassword'),
@@ -191,8 +191,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;

View File

@@ -24,7 +24,7 @@
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:label="lt('Translation')"
:label="t('Translation')"
ref="translationId"
:error-messages="form().serverErrors(this, 'translationId')"
@input="fieldValueChanged('translationId')"
@@ -37,7 +37,7 @@
:readonly="formState.readOnly"
clearable
@click:clear="fieldValueChanged('emailAddress')"
:label="lt('UserEmailAddress')"
:label="t('UserEmailAddress')"
:error-messages="form().serverErrors(this, 'emailAddress')"
ref="emailAddress"
@input="fieldValueChanged('emailAddress')"
@@ -51,7 +51,7 @@
:readonly="formState.readOnly"
clearable
@click:clear="fieldValueChanged('currencyName')"
:label="lt('CurrencyCode')"
:label="t('CurrencyCode')"
:rules="[form().required(this, 'currencyName')]"
:error-messages="form().serverErrors(this, 'currencyName')"
ref="currencyName"
@@ -62,7 +62,7 @@
<v-checkbox
v-model="obj.hour12"
:readonly="formState.readOnly"
:label="lt('Hour12')"
:label="t('Hour12')"
ref="hour12"
:error-messages="form().serverErrors(this, 'hour12')"
@change="fieldValueChanged('hour12')"
@@ -71,7 +71,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<!-- https://vuetifyjs.com/en/components/color-pickers -->
<span class="v-label v-label--active theme--light">
{{ lt("UserColor") }}
{{ t("UserColor") }}
</span>
<v-color-picker
v-model="obj.uiColor"
@@ -91,7 +91,7 @@
:readonly="formState.readOnly"
clearable
@click:clear="fieldValueChanged('languageOverride')"
:label="lt('LanguageCode')"
:label="t('LanguageCode')"
:error-messages="form().serverErrors(this, 'languageOverride')"
ref="languageOverride"
@input="fieldValueChanged('languageOverride')"
@@ -105,7 +105,7 @@
:readonly="formState.readOnly"
clearable
@click:clear="fieldValueChanged('timeZoneOverride')"
:label="lt('TimeZone')"
:label="t('TimeZone')"
:error-messages="form().serverErrors(this, 'timeZoneOverride')"
ref="timeZoneOverride"
@input="fieldValueChanged('timeZoneOverride')"
@@ -231,8 +231,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;

View File

@@ -23,7 +23,7 @@
clearable
@click:clear="fieldValueChanged('name')"
:counter="255"
:label="lt('WidgetName')"
:label="t('WidgetName')"
:rules="[
form().max255(this, 'name'),
form().required(this, 'name')
@@ -46,7 +46,7 @@
clearable
@click:clear="fieldValueChanged('serial')"
:counter="10"
:label="lt('WidgetSerial')"
:label="t('WidgetSerial')"
:rules="[form().maxLength(this, 'serial', 10)]"
:error-messages="form().serverErrors(this, 'serial')"
ref="serial"
@@ -66,7 +66,7 @@
clearable
@click:clear="fieldValueChanged('count')"
:counter="10"
:label="lt('WidgetCount')"
:label="t('WidgetCount')"
ref="count"
:rules="[form().integerValid(this, 'count')]"
:error-messages="form().serverErrors(this, 'count')"
@@ -85,7 +85,7 @@
<gz-currency
v-model="obj.dollarAmount"
:readonly="formState.readOnly"
:label="lt('WidgetDollarAmount')"
:label="t('WidgetDollarAmount')"
ref="dollarAmount"
:rules="[
form().decimalValid(this, 'dollarAmount'),
@@ -98,7 +98,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker
:label="lt('WidgetStartDate')"
:label="t('WidgetStartDate')"
v-model="obj.startDate"
:readonly="formState.readOnly"
ref="startDate"
@@ -109,7 +109,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-date-time-picker
:label="lt('WidgetEndDate')"
:label="t('WidgetEndDate')"
:rules="[form().datePrecedence(this, 'startDate', 'endDate')]"
:error-messages="form().serverErrors(this, 'endDate')"
v-model="obj.endDate"
@@ -128,7 +128,7 @@
<v-checkbox
v-model="obj.active"
:readonly="formState.readOnly"
:label="lt('Active')"
:label="t('Active')"
ref="active"
:error-messages="form().serverErrors(this, 'active')"
@change="fieldValueChanged('active')"
@@ -147,7 +147,7 @@
:showEditIcon="true"
v-model="obj.userId"
:readonly="formState.readOnly"
:label="lt('User')"
:label="t('User')"
ref="userid"
:error-messages="form().serverErrors(this, 'userid')"
@input="fieldValueChanged('userid')"
@@ -167,7 +167,7 @@
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:label="lt('WidgetUserType')"
:label="t('WidgetUserType')"
ref="usertype"
:rules="[form().integerValid(this, 'usertype')]"
:error-messages="form().serverErrors(this, 'usertype')"
@@ -179,7 +179,7 @@
<v-textarea
v-model="obj.notes"
:readonly="formState.readOnly"
:label="lt('WidgetNotes')"
:label="t('WidgetNotes')"
:error-messages="form().serverErrors(this, 'notes')"
ref="notes"
@input="fieldValueChanged('notes')"
@@ -368,8 +368,8 @@ export default {
}
},
methods: {
lt(ltKey) {
return window.$gz.translation.get(ltKey);
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;