From 8d3a614b9c5a1f2004e70effad9727a945d2842b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 21 Jul 2021 23:20:13 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 7 ++----- ayanova/src/App.vue | 2 +- ayanova/src/api/translation.js | 3 ++- ayanova/src/views/adm-global-settings.vue | 4 +++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index c5ff687c..250bbbff 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -458,12 +458,9 @@ CURRENTLY DOING: more misc stuff below to complete workorder!!! CASES TODO: Some initial workorder cases to do + - - bugbug: data tables are showing the translation key, not the translation in the top of the list, however the page title is correctly translated - wtf? - - AdministrationGlobalSettings showing instead of translation? Is this valid + AdministrationGlobalSettings showing instead of translation? Is this valid. Yes key is valid, not sure why it's not translated 3721 1: make labor rate mandatory on workorderitemlabor record and import v7 with some kind of dummy rate if not filled in there um...be sure about this, mandatory stuff kind of sucks, what's up in that case? diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue index d24ec8f2..820924b2 100644 --- a/ayanova/src/App.vue +++ b/ayanova/src/App.vue @@ -383,7 +383,7 @@ export default { return this.$store.state.helpUrl; }, titleDisplay() { - if (this.appBar.title == null) { + if (this.appBar.title == null || this.appBar.title == "") { return null; } if (this.appBar.title.includes(":")) { diff --git a/ayanova/src/api/translation.js b/ayanova/src/api/translation.js index d050b8be..94e1eac1 100644 --- a/ayanova/src/api/translation.js +++ b/ayanova/src/api/translation.js @@ -71,7 +71,8 @@ export default { }, get(key) { if (!key) { - return "??NO_TRANSLATION_KEY"; + console.trace("translation.js::get, no translation key was presented"); + return ""; } //no translation for Wiki if (key == "Wiki") { diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue index d3f0974a..65e5ed3d 100644 --- a/ayanova/src/views/adm-global-settings.vue +++ b/ayanova/src/views/adm-global-settings.vue @@ -977,11 +977,13 @@ function generateMenu(vm) { isMain: false, readOnly: vm.formState.readOnly, icon: "$ayiCogs", + //title: vm.$ay.t("AdministrationGlobalSettings"), title: "AdministrationGlobalSettings", helpUrl: "adm-global-settings", formData: { ayaType: window.$gz.type.Project, - recordId: vm.$route.params.recordid + recordId: vm.$route.params.recordid, + recordName: vm.$ay.t("AdministrationGlobalSettings") //, //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, },