From 5d836cf05dac7b763becd07ed76e5c818b4d741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Wed, 10 Nov 2021 10:09:21 +0100 Subject: [PATCH 01/33] [empty commit] pull request for updating translatables From 2c85491ee011ca7f7ba655592eb292b2aa5733c7 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:52:22 +0100 Subject: [PATCH 02/33] Replace body and header placeholder functions with translations --- src/languages/en.js | 2 ++ src/pages/EditMonitor.vue | 18 ++---------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 15c3cd0f..37c1dd69 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -307,4 +307,6 @@ export default { steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", "Current User": "Current User", recent: "Recent", + headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", + bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", }; diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 65c3dad6..332a9810 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -257,13 +257,13 @@
- +
- +
@@ -339,20 +339,6 @@ export default { return this.$root.baseURL + "/api/push/" + this.monitor.pushToken + "?msg=OK&ping="; }, - bodyPlaceholder() { - return `Example: -{ - "key": "value" -}`; - }, - - headersPlaceholder() { - return `Example: -{ - "HeaderName": "HeaderValue" -}`; - } - }, watch: { From 267654c987490d66bace688955badb156516649f Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:53:38 +0100 Subject: [PATCH 03/33] Replace hard-coded names for groups in Status page with translations --- src/languages/en.js | 3 +++ src/pages/StatusPage.vue | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 37c1dd69..273ece35 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -309,4 +309,7 @@ export default { recent: "Recent", headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", + // Status page + "Untitled Group": "Untitled Group", + "Services": "Services", }; diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index ce0f94b5..82e46a74 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -468,10 +468,10 @@ export default { }, addGroup() { - let groupName = "Untitled Group"; + let groupName = this.$t("Untitled Group"); if (this.$root.publicGroupList.length === 0) { - groupName = "Services"; + groupName = this.$t("Services"); } this.$root.publicGroupList.push({ From 265cca9ed1db2cbbacf2dc4781407fb1e50a614a Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:54:09 +0100 Subject: [PATCH 04/33] Replace "Default" notification badge with translation --- src/languages/en.js | 1 + src/pages/EditMonitor.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index 273ece35..6f1a6b5f 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -307,6 +307,7 @@ export default { steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", "Current User": "Current User", recent: "Recent", + Default: "Default", headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", // Status page diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 332a9810..907ecfa6 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -215,7 +215,7 @@ {{ $t("Edit") }} - Default + {{ $t("Default") }} From 28f530394e69e1c5cea4382b2b9b74fc147daca9 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 11:12:48 +0100 Subject: [PATCH 08/33] Add missing translation lookup for ClickSendSMS --- src/components/notifications/ClickSendSMS.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/notifications/ClickSendSMS.vue b/src/components/notifications/ClickSendSMS.vue index 2aed4184..4fbb2f41 100644 --- a/src/components/notifications/ClickSendSMS.vue +++ b/src/components/notifications/ClickSendSMS.vue @@ -3,7 +3,7 @@
{{ $t("apiCredentials") }} - here + {{ $t("here") }}
From 4cc433166e6f3efc2419db2af628912328bf2293 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 11:14:21 +0100 Subject: [PATCH 09/33] Add missing translation for SMTP security option --- src/components/notifications/SMTP.vue | 2 +- src/languages/en.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/notifications/SMTP.vue b/src/components/notifications/SMTP.vue index 483917e3..ab660abe 100644 --- a/src/components/notifications/SMTP.vue +++ b/src/components/notifications/SMTP.vue @@ -10,7 +10,7 @@
- + + +
- +
@@ -352,6 +352,20 @@ export default { return this.$root.baseURL + "/api/push/" + this.monitor.pushToken + "?msg=OK&ping="; }, + bodyPlaceholder() { + return `Example: +{ + "key": "value" +}`; + }, + + headersPlaceholder() { + return `Example: +{ + "HeaderName": "HeaderValue" +}`; + } + }, watch: { From c1b118a0f6325cf05ea252a921f3d09a775fdeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Mon, 29 Nov 2021 12:49:08 +0100 Subject: [PATCH 32/33] Use existing Example translation for HTTP headers and body placeholders --- src/pages/EditMonitor.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 2678a94a..4a0d0408 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -353,17 +353,17 @@ export default { }, bodyPlaceholder() { - return `Example: + return this.$t("Example:", [` { "key": "value" -}`; +}`]); }, headersPlaceholder() { - return `Example: + return this.$t("Example:", [` { "HeaderName": "HeaderValue" -}`; +}`]); } }, From baae4b5a5e19132981de5ace878cd2c1869cca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Mon, 29 Nov 2021 12:49:38 +0100 Subject: [PATCH 33/33] Remove unused translation keys from hr-HR --- src/languages/hr-HR.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js index 8d23f003..129403fa 100644 --- a/src/languages/hr-HR.js +++ b/src/languages/hr-HR.js @@ -316,8 +316,6 @@ export default { "Pick Accepted Status Codes...": "Odaberite HTTP statusne kodove koji će biti prihvaćeni...", "Steam API Key": "Steam API ključ", Default: "Zadano", - headersPlaceholder: "Primjer:\n{\n \"NazivZaglavlja\": \"VrijednostZaglavlja\"\n}", - bodyPlaceholder: "Primjer:\n{\n \"ključ\": \"vrijednost\"\n}", "HTTP Options": "HTTP Postavke", "Create Incident": "Novi izvještaj o incidentu", Title: "Naslov",