admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved t function to global and misc cleanup

Browse Source
This commit is contained in:
John Cardinal
2020-04-04 17:06:25 +00:00
parent 90c388ecc2
commit 43de3c8fb0
20 changed files with 242 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ayanova/src/views/ay-about.vue
View File

@@ -14,13 +14,13 @@
</v-col>
<v-col>
<v-card id="ayaNovaVersioncard">
<v-subheader>{{ t("ClientApp") }}</v-subheader>
<v-subheader>{{ $ay.t("ClientApp") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ t("Version") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("Version") }}: </span>
<span class="body-2">{{ clientInfo.version }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("User") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("User") }}: </span>
<span class="body-2">{{ this.$store.state.userName }}</span>
</div>
@@ -32,78 +32,78 @@
</div>
<div>
<span class="ml-6 body-1">{{ t("TimeZone") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("TimeZone") }}: </span>
<span class="body-2">
{{ locale().getBrowserTimeZoneName() }}
</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("LanguageCode") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("LanguageCode") }}: </span>
<span class="body-2">{{ locale().getBrowserFirstLanguage() }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("CurrencyCode") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("CurrencyCode") }}: </span>
<span class="body-2">{{ locale().getCurrencyName() }}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ t("Browser") }}</v-subheader>
<v-subheader>{{ $ay.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>{{ t("Server") }}</v-subheader>
<v-subheader>{{ $ay.t("Server") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ t("ServerAddress") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("ServerAddress") }}: </span>
<span class="body-2">{{ this.$store.state.apiUrl }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("Version") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("Version") }}: </span>
<span class="body-2">{{ serverInfo.serverVersion }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("SchemaVersion") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("SchemaVersion") }}: </span>
<span class="body-2">{{ serverInfo.dbSchemaVersion }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("ServerTime") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("ServerTime") }}: </span>
<span class="body-2">{{ serverInfo.serverLocalTime }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("TimeZone") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("TimeZone") }}: </span>
<span class="body-2">{{ serverInfo.serverTimeZone }}</span>
</div>
<div v-if="canViewLicenseInfo()">
<v-divider class="mt-6"></v-divider>
<v-subheader>{{ t("HelpLicense") }}</v-subheader>
<v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
<div>
<span class="ml-6 body-1">{{ t("RegisteredUser") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("RegisteredUser") }}: </span>
<span class="body-2">{{
serverInfo.license.license.licensedTo
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("DatabaseID") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("DatabaseID") }}: </span>
<span class="body-2">{{ serverInfo.license.license.dbId }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("LicenseSerial") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("LicenseSerial") }}: </span>
<span class="body-2">{{
serverInfo.license.license.keySerial
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("LicenseExpiration") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("LicenseExpiration") }}: </span>
<span class="body-2">{{
serverInfo.license.license.licenseExpiration
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ t("SupportedUntil") }}: </span>
<span class="ml-6 body-1">{{ $ay.t("SupportedUntil") }}: </span>
<span class="body-2">{{
serverInfo.license.license.maintenanceExpiration
}}</span>
@@ -111,7 +111,7 @@
<v-divider class="mt-6"></v-divider>
<v-subheader data-cy="aboutlicensedoptions">{{
t("LicensedOptions")
$ay.t("LicensedOptions")
}}</v-subheader>
<div
@@ -173,9 +173,6 @@ export default {
};
},
methods: {
t(tKey) {
return window.$gz.translation.get(tKey);
},
translation() {
return window.$gz.translation;
},