Fix i18n

Missing webhook json description Ajust Telegram context-based sentence, (also changed translated language files) Missing primary base url label Wrong PromoSMS i18n Missing Octopush legacy hint Missing Matrix i18n Missing push url i18n
2024-10-01 01:25:45 -04:00 · 2021-10-12 16:29:18 +08:00 · 2021-10-12 16:29:18 +08:00 · 3fe91c52cb
commit 3fe91c52cb
parent a2cc7d1db9
12 changed files with 35 additions and 25 deletions
--- a/src/components/notifications/Matrix.vue
+++ b/src/components/notifications/Matrix.vue
@ -1,25 +1,25 @@
 <template>
    <div class="mb-3">
-        <label for="homeserver-url" class="form-label">Homeserver URL (with http(s):// and optionally port)</label><span style="color: red;"><sup>*</sup></span>
+        <label for="homeserver-url" class="form-label">{{ $t("matrixHomeserverURL") }}</label><span style="color: red;"><sup>*</sup></span>
        <input id="homeserver-url" v-model="$parent.notification.homeserverUrl" type="text" class="form-control" :required="true">
    </div>
    <div class="mb-3">
-        <label for="internal-room-id" class="form-label">Internal Room Id</label><span style="color: red;"><sup>*</sup></span>
+        <label for="internal-room-id" class="form-label">{{ $t("Internal Room Id") }}</label><span style="color: red;"><sup>*</sup></span>
        <input id="internal-room-id" v-model="$parent.notification.internalRoomId" type="text" class="form-control" required="true">
    </div>
    <div class="mb-3">
-        <label for="access-token" class="form-label">Access Token</label><span style="color: red;"><sup>*</sup></span>
+        <label for="access-token" class="form-label">{{ $t("Access Token") }}</label><span style="color: red;"><sup>*</sup></span>
        <HiddenInput id="access-token" v-model="$parent.notification.accessToken" :required="true" autocomplete="one-time-code" :maxlength="500"></HiddenInput>
    </div>

    <div class="form-text">
-        <span style="color: red;"><sup>*</sup></span>Required
+        <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
        <p style="margin-top: 8px;">
-            You can find the internal room ID by looking in the advanced section of the room settings in your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.
-        </p>
-        <p style="margin-top: 8px;">
-            It is highly recommended you create a new user and do not use your own Matrix user's access token as it will allow full access to your account and all the rooms you joined. Instead, create a new user and only invite it to the room that you want to receive the notification in. You can get the access token by running <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+            {{ $t("matrixDesc1") }}
        </p>
+        <i18n-t tag="p" keypath="matrixDesc2" style="margin-top: 8px;">
+            <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+        </i18n-t>
    </div>
 </template>

@ -30,5 +30,5 @@ export default {
    components: {
        HiddenInput,
    },
-}
+};
 </script>
--- a/src/components/notifications/Octopush.vue
+++ b/src/components/notifications/Octopush.vue
@ -6,7 +6,7 @@
            <option value="1">Legacy Octopush-DM (endpoint: www.octopush-dm.com)</option>
        </select>
        <div class="form-text">
-            Do you use the legacy version of Octopush (2011-2020) or the new version?
+            {{ $t("octopushLegacyHint") }}
        </div>
    </div>
    <div class="mb-3">
--- a/src/components/notifications/PromoSMS.vue
+++ b/src/components/notifications/PromoSMS.vue
@ -13,9 +13,10 @@
            <option value="2">{{ $t("promosmsTypeFull") }}</option>
            <option value="3">{{ $t("promosmsTypeSpeed") }}</option>
        </select>
-        <i18n-t tag="div" keypath="Check PromoSMS prices" class="form-text">
+        <div class="form-text">
+            {{ $t("checkPrice", [$t("promosms")]) }}
            <a href="https://promosms.com/cennik/" target="_blank">https://promosms.com/cennik/</a>
-        </i18n-t>
+        </div>
    </div>
    <div class="mb-3">
        <label for="promosms-phone-number" class="form-label">{{ $t("promosmsPhoneNumber") }}</label>
@ -25,7 +26,6 @@
        <label for="promosms-sender-name" class="form-label">{{ $t("promosmsSMSSender") }}</label>
        <input id="promosms-sender-name" v-model="$parent.notification.promosmsSenderName" type="text" minlength="3" maxlength="11" class="form-control">
    </div>
-
 </template>

 <script>
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@ -2,9 +2,9 @@
    <div class="mb-3">
        <label for="telegram-bot-token" class="form-label">{{ $t("Bot Token") }}</label>
        <HiddenInput id="telegram-bot-token" v-model="$parent.notification.telegramBotToken" :required="true" autocomplete="one-time-code"></HiddenInput>
-        <div class="form-text">
-            {{ $t("You can get a token from") }} <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>.
-        </div>
+        <i18n-t tag="div" keypath="wayToGetTelegramToken" class="form-text">
+            <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>
+        </i18n-t>
    </div>

    <div class="mb-3">
--- a/src/components/notifications/Webhook.vue
+++ b/src/components/notifications/Webhook.vue
@ -16,7 +16,7 @@
        </select>

        <div class="form-text">
-            <p>"application/json" is good for any modern http servers such as express.js</p>
+            <p>{{ $t("webhookJsonDesc", ["\"application/json\""]) }}</p>
            <i18n-t tag="p" keypath="webhookFormDataDesc">
                <template #multipart>"multipart/form-data"</template>
                <template #decodeFunction>
--- a/src/languages/en.js
+++ b/src/languages/en.js
@ -33,6 +33,7 @@ export default {
    Appearance: "Appearance",
    Theme: "Theme",
    General: "General",
+    "Primary Base URL": "Primary Base URL",
    Version: "Version",
    "Check Update On GitHub": "Check Update On GitHub",
    List: "List",
@ -75,6 +76,9 @@ export default {
    "Upside Down Mode": "Upside Down Mode",
    "Max. Redirects": "Max. Redirects",
    "Accepted Status Codes": "Accepted Status Codes",
+    "Push URL": "Push URL",
+    needPushEvery: "You should call this url every {0} seconds.",
+    pushOptionalParams: "Optional parameters: {'msg'}, {'ping'}",
    Save: "Save",
    Notifications: "Notifications",
    "Not available, please setup.": "Not available, please setup.",
@ -185,7 +189,7 @@ export default {
    "Required": "Required",
    "telegram": "Telegram",
    "Bot Token": "Bot Token",
-    "You can get a token from": "You can get a token from",
+    wayToGetTelegramToken: "You can get a token from {0}.",
    "Chat ID": "Chat ID",
    supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
    wayToGetTelegramChatID: "You can get your chat id by sending message to the bot and go to this url to view the chat_id:",
@ -251,6 +255,8 @@ export default {
    "SMS Type": "SMS Type",
    octopushTypePremium: "Premium (Fast - recommended for alerting)",
    octopushTypeLowCost: "Low Cost (Slow, sometimes blocked by operator)",
+    checkPrice: "Check {0} prices:",
+    octopushLegacyHint: "Do you use the legacy version of Octopush (2011-2020) or the new version?",
    "Check octopush prices": "Check octopush prices {0}.",
    octopushPhoneNumber: "Phone number (intl format, eg : +33612345678) ",
    octopushSMSSender: "SMS Sender Name : 3-11 alphanumeric characters and space (a-zA-Z0-9)",
@ -281,5 +287,9 @@ export default {
    promosmsPhoneNumber: "Phone number (for Polish recipient You can skip area codes)",
    promosmsSMSSender: "SMS Sender Name : Pre-registred name or one of defaults: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
    "Feishu WebHookUrl": "Feishu WebHookUrl",
+    matrixHomeserverURL: "Homeserver URL (with http(s):// and optionally port)",
+    "Internal Room Id": "Internal Room Id",
+    matrixDesc1: "You can find the internal room ID by looking in the advanced section of the room settings in your Matrix client. It should look like !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "It is highly recommended you create a new user and do not use your own Matrix user's access token as it will allow full access to your account and all the rooms you joined. Instead, create a new user and only invite it to the room that you want to receive the notification in. You can get the access token by running {0}",
    // End notification form
 };
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@ -185,7 +185,7 @@ export default {
    "Required": "Requis",
    "telegram": "Telegram",
    "Bot Token": "Bot Token",
-    "You can get a token from": "Vous pouvez obtenir un token depuis",
+    wayToGetTelegramToken: "Vous pouvez obtenir un token depuis {0}.",
    "Chat ID": "Chat ID",
    supportTelegramChatID: "Supporte les messages privés / en groupe / l'ID du salon",
    wayToGetTelegramChatID: "Vous pouvez obtenir l'ID du chat en envoyant un message avec le bot puis en récupérant l'URL pour voir l'ID du salon :",
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@ -184,7 +184,7 @@ export default {
    Required: "필수",
    telegram: "Telegram",
    "Bot Token": "봇 토큰",
-    "You can get a token from": "토큰은 여기서 얻을 수 있어요:",
+    wayToGetTelegramToken: "토큰은 여기서 얻을 수 있어요: {0}.",
    "Chat ID": "채팅 ID",
    supportTelegramChatID: "Direct Chat / Group / Channel's Chat ID를 지원해요.",
    wayToGetTelegramChatID: "봇에 메시지를 보내 채팅 ID를 얻고 밑에 URL로 이동해 chat_id를 볼 수 있어요.",
--- a/src/languages/nb-NO.js
+++ b/src/languages/nb-NO.js
@ -185,7 +185,7 @@ export default {
    "Required": "Obligatorisk",
    "telegram": "Telegram",
    "Bot Token": "Bot Token",
-    "You can get a token from": "Du kan få et token fra",
+    wayToGetTelegramToken: "Du kan få et token fra {0}.",
    "Chat ID": "Chat ID",
    supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
    wayToGetTelegramChatID: "Du kan få chat-ID-en din ved å sende meldingen til boten og gå til denne nettadressen for å se chat_id:",
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@ -185,7 +185,7 @@ export default {
    "Required": "Wymagane",
    "telegram": "Telegram",
    "Bot Token": "Token Bota",
-    "You can get a token from": "Token można uzyskać z",
+    wayToGetTelegramToken: "Token można uzyskać z {0}.",
    "Chat ID": "Identyfikator Czatu",
    supportTelegramChatID: "Czat wsprarcia technicznego / Bezpośrednia Rozmowa / Czat Grupowy",
    wayToGetTelegramChatID: "Możesz uzyskać swój identyfikator czatu, wysyłając wiadomość do bota i przechodząc pod ten adres URL, aby wyświetlić identyfikator czatu:",
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@ -49,8 +49,8 @@
                                <label for="push-url" class="form-label">{{ $t("Push URL") }}</label>
                                <CopyableInput id="push-url" v-model="pushURL" type="url" disabled="disabled" />
                                <div class="form-text">
-                                    You should call this url every {{ monitor.interval }} seconds.<br />
-                                    Optional parameters: msg, ping
+                                    {{ $t("needPushEvery", [monitor.interval]) }}<br />
+                                    {{ $t("pushOptionalParams") }}
                                </div>
                            </div>

--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@ -108,7 +108,7 @@

                            <!-- Primary Base URL -->
                            <div class="mb-4">
-                                <label class="form-label" for="primaryBaseURL">Primary Base URL</label>
+                                <label class="form-label" for="primaryBaseURL">{{ $t("Primary Base URL") }}</label>

                                <div class="input-group mb-3">
                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://" pattern="https?://.+">