diff --git a/src/components/notifications/ClickSendSMS.vue b/src/components/notifications/ClickSendSMS.vue index b0aec48eb..b4316ca3d 100644 --- a/src/components/notifications/ClickSendSMS.vue +++ b/src/components/notifications/ClickSendSMS.vue @@ -9,10 +9,14 @@
-
- {{ $t("checkPrice", ["clicksendsms"]) }} - https://clicksend.com/us/pricing -
+ + + +
diff --git a/src/components/notifications/PromoSMS.vue b/src/components/notifications/PromoSMS.vue index 15ed241b7..84a18200e 100644 --- a/src/components/notifications/PromoSMS.vue +++ b/src/components/notifications/PromoSMS.vue @@ -13,10 +13,14 @@ -
- {{ $t("checkPrice", [$t("promosms")]) }} - https://promosms.com/cennik/ -
+ + + +
diff --git a/src/components/notifications/SMSC.vue b/src/components/notifications/SMSC.vue index 5f885a494..369e179a7 100644 --- a/src/components/notifications/SMSC.vue +++ b/src/components/notifications/SMSC.vue @@ -11,10 +11,14 @@
-
- {{ $t("checkPrice", ['СМСЦ']) }} - https://smsc.kz/tariffs/ -
+ + + +
diff --git a/src/components/notifications/SMSManager.vue b/src/components/notifications/SMSManager.vue index 00be2fa7f..185390e93 100644 --- a/src/components/notifications/SMSManager.vue +++ b/src/components/notifications/SMSManager.vue @@ -9,9 +9,14 @@
-
- {{ $t("You can divide numbers with") }} , {{ $t("or") }} ; -
+ + + +
@@ -23,9 +28,13 @@
-
- {{ $t("checkPrice", [$t("SMSManager")]) }} - {{ $t("here") }} -
+ + + +
diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue index 487c3ba3a..ea65521eb 100644 --- a/src/components/settings/General.vue +++ b/src/components/settings/General.vue @@ -142,12 +142,13 @@ v-model="settings.steamAPIKey" autocomplete="new-password" /> -
- {{ $t("steamApiKeyDescription") }} - - https://steamcommunity.com/dev - -
+ + + diff --git a/src/lang/en.json b/src/lang/en.json index 14bf701b4..ecbd3fd22 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -259,14 +259,14 @@ "Body": "Body", "Headers": "Headers", "PushUrl": "Push URL", - "HeadersInvalidFormat": "The request headers are not valid JSON: ", - "BodyInvalidFormat": "The request body is not valid JSON: ", + "HeadersInvalidFormatBecause": "The request headers are not valid JSON because {error}", + "BodyInvalidFormatBecause": "The request body is not valid JSON because {error}", "Monitor History": "Monitor History", "clearDataOlderThan": "Keep monitor history data for {0} days.", "PasswordsDoNotMatch": "Passwords do not match.", "records": "records", "One record": "One record", - "steamApiKeyDescription": "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", + "steamApiKeyDescriptionAt": "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key at {url}", "Current User": "Current User", "topic": "Topic", "topicExplanation": "MQTT topic to monitor", @@ -703,7 +703,7 @@ "SMS Type": "SMS Type", "octopushTypePremium": "Premium (Fast - recommended for alerting)", "octopushTypeLowCost": "Low Cost (Slow - sometimes blocked by operator)", - "checkPrice": "Check {0} prices:", + "checkPriceAt": "Check {service} prices at {url}", "apiCredentials": "API credentials", "octopushLegacyHint": "Do you use the legacy version of Octopush (2011-2020) or the new version?", "Check octopush prices": "Check octopush prices {0}.", @@ -725,9 +725,9 @@ "Lowcost": "Lowcost", "high": "high", "SendKey": "SendKey", - "SMSManager API Docs": "SMSManager API Docs ", + "SMSManager API Docs": "SMSManager API Docs", "Gateway Type": "Gateway Type", - "You can divide numbers with": "You can divide numbers with", + "You can divide numbers with commas or semicolons": "You can divide numbers with {comma} or {semicolon}", "Base URL": "Base URL", "goAlertInfo": "GoAlert is a An open source application for on-call scheduling, automated escalations and notifications (like SMS or voice calls). Automatically engage the right person, the right way, and at the right time! {0}", "goAlertIntegrationKeyInfo": "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.", @@ -1292,10 +1292,8 @@ "Sort by certificate expiry": "Sort by certificate expiry", "Splunk Rest URL": "Splunk Rest URL", "Severity": "Severity", - "SMSManager": "SMSManager", "Message Format": "Message Format", "smscTranslit": "smscTranslit", - "promosms": "promosms", "Region": "Region", "PushDeer Server URL": "PushDeer Server URL", "To Number": "To Number", diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 8aae28a90..9a0a6fa54 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -2068,7 +2068,7 @@ message HealthCheckResponse { try { JSON.parse(this.monitor.body); } catch (err) { - toast.error(this.$t("BodyInvalidFormat") + err.message); + toast.error(this.$t("BodyInvalidFormatBecause", {error: err.message})); return false; } } @@ -2076,7 +2076,7 @@ message HealthCheckResponse { try { JSON.parse(this.monitor.headers); } catch (err) { - toast.error(this.$t("HeadersInvalidFormat") + err.message); + toast.error(this.$t("HeadersInvalidFormatBecause", {error: err.message})); return false; } }