From d6c2a4ba1c547f55f3f02e72e536dc54d5109cc6 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Fri, 31 Mar 2023 21:43:11 +0200 Subject: [PATCH] webapp: Remove hard coded texts in dtuadmin view --- webapp/src/locales/de.json | 3 ++- webapp/src/locales/en.json | 3 ++- webapp/src/locales/fr.json | 3 ++- webapp/src/views/DtuAdminView.vue | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index 5a761ed..1e48a33 100644 --- a/webapp/src/locales/de.json +++ b/webapp/src/locales/de.json @@ -330,7 +330,8 @@ "CmtFrequency": "CMT2300A Frequenz:", "CmtFrequencyHint": "Stelle sicher, dass du nur Frequenzen verwendet werden welche im entsprechenden Land erlaubt sind!", "CmtFrequencyWarning": "Die ausgewählte Frequenz befindet außerhalb des in der EU zugelassenen Bereiches. Vergewissere dich, dass mit dieser Auswahl keine lokalen Regularien verletzt werden.", - "khz": "kHz", + "MHz": "{mhz} MHz", + "dBm": "{dbm} dBm", "Save": "Speichern", "Min": "Minimum ({db} dBm)", "Low": "Niedrig ({db} dBm)", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index c4f927b..95940b4 100644 --- a/webapp/src/locales/en.json +++ b/webapp/src/locales/en.json @@ -330,7 +330,8 @@ "CmtFrequency": "CMT2300A Frequency:", "CmtFrequencyHint": "Make sure to only use frequencies that are allowed in the respective country!", "CmtFrequencyWarning": "The selected frequency is outside the range allowed in the EU. Make sure that this selection does not violate any local regulations.", - "khz": "kHz", + "MHz": "{mhz} MHz", + "dBm": "{dbm} dBm", "Save": "Save", "Min": "Minimum ({db} dBm)", "Low": "Low ({db} dBm)", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index ca6b56a..480089d 100644 --- a/webapp/src/locales/fr.json +++ b/webapp/src/locales/fr.json @@ -330,7 +330,8 @@ "CmtFrequency": "CMT2300A Frequency:", "CmtFrequencyHint": "Stelle sicher, dass du nur Frequenzen verwendet werden welche im entsprechenden Land erlaubt sind!", "CmtFrequencyWarning": "The selected frequency is outside the range allowed in the EU. Make sure that this selection does not violate any local regulations.", - "khz": "kHz", + "MHz": "{mhz} MHz", + "dBm": "{dbm} dBm", "Save": "Sauvegarder", "Min": "Minimum ({db} dBm)", "Low": "Bas ({db} dBm)", diff --git a/webapp/src/views/DtuAdminView.vue b/webapp/src/views/DtuAdminView.vue index dadce8c..1a5fc07 100644 --- a/webapp/src/views/DtuAdminView.vue +++ b/webapp/src/views/DtuAdminView.vue @@ -109,10 +109,10 @@ export default defineComponent({ }, computed: { cmtFrequencyText() { - return this.$n(this.dtuConfigList.cmt_frequency / 1000, "decimalTwoDigits") + " MHz"; + return this.$t("dtuadmin.MHz", { mhz: this.$n(this.dtuConfigList.cmt_frequency / 1000, "decimalTwoDigits") }); }, cmtPaLevelText() { - return this.$n(this.dtuConfigList.cmt_palevel * 1) + " dBm"; + return this.$t("dtuadmin.dBm", { dbm: this.$n(this.dtuConfigList.cmt_palevel * 1) }); }, cmtIsOutOfEu() { return this.dtuConfigList.cmt_frequency < 863000 || this.dtuConfigList.cmt_frequency > 870000;