Merge branch 'master' into better-aria

src/components/notifications/Cellsynt.vue

@@ -14,25 +14,25 @@
             <option value="numeric">{{ $t("Telephone number") }}</option>
         </select>
         <div class="form-text">
-            <p><b>{{ $t("Alphanumeric (recommended)") }}:</b><br /> {{ $t("Alphanumeric string (max 11 alphanumeric characters). Recipients can not reply to the message.") }}</p>
-            <p><b>{{ $t("Telephone number") }}:</b><br /> {{ $t("Numeric value (max 15 digits) with telephone number on international format without leading 00 (example UK number 07920 110 000 should be set as 447920110000). Recipients can reply to the message.") }}</p>
+            <p><b>{{ $t("Alphanumeric (recommended)") }}:</b><br /> {{ $t("cellsyntOriginatortypeAlphanumeric") }}</p>
+            <p><b>{{ $t("Telephone number") }}:</b><br /> {{ $t("cellsyntOriginatortypeNumeric") }}</p>
         </div>
     </div>
     <div class="mb-3">
         <label for="cellsynt-originator" class="form-label">{{ $t("Originator") }} <small>({{ $parent.notification.cellsyntOriginatortype === 'alpha' ? $t("max 11 alphanumeric characters") : $t("max 15 digits") }})</small></label>
         <input v-if="$parent.notification.cellsyntOriginatortype === 'alpha'" id="cellsynt-originator" v-model="$parent.notification.cellsyntOriginator" type="text" class="form-control" pattern="[a-zA-Z0-9\s]+" maxlength="11" required>
         <input v-else id="cellsynt-originator" v-model="$parent.notification.cellsyntOriginator" type="number" class="form-control" pattern="[0-9]+" maxlength="15" required>
-        <div class="form-text"><p>{{ $t("Visible on recipient's mobile phone as originator of the message. Allowed values and function depends on parameter originatortype.") }}</p></div>
+        <div class="form-text"><p>{{ $t("cellsyntOriginator") }}</p></div>
     </div>
     <div class="mb-3">
         <label for="cellsynt-destination" class="form-label">{{ $t("Destination") }}</label>
         <input id="cellsynt-destination" v-model="$parent.notification.cellsyntDestination" type="text" class="form-control" required>
-        <div class="form-text"><p>{{ $t("Recipient's telephone number using international format with leading 00 followed by country code, e.g. 00447920110000 for the UK number 07920 110 000 (max 17 digits in total). Max 25000 comma separated recipients per HTTP request.") }}</p></div>
+        <div class="form-text"><p>{{ $t("cellsyntDestination") }}</p></div>
     </div>
     <div class="form-check form-switch">
         <input id="cellsynt-allow-long" v-model="$parent.notification.cellsyntAllowLongSMS" type="checkbox" class="form-check-input">
         <label for="cellsynt-allow-long" class="form-label">{{ $t("Allow Long SMS") }}</label>
-        <div class="form-text">{{ $t("Split long messages into up to 6 parts. 153 x 6 = 918 characters.") }}</div>
+        <div class="form-text">{{ $t("cellsyntSplitLongMessages") }}</div>
     </div>
     <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
         <a href="https://www.cellsynt.com/en/" target="_blank">https://www.cellsynt.com/en/</a>

src/components/notifications/ClickSendSMS.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="mb-3">
         <div class="form-text">
-            {{ $t("checkPrice", [$t("clicksendsms")]) }}
+            {{ $t("checkPrice", ["clicksendsms"]) }}
             <a href="https://www.clicksend.com/us/pricing" target="_blank">https://clicksend.com/us/pricing</a>
         </div>
     </div>

src/components/notifications/Octopush.vue

@@ -2,7 +2,7 @@
     <div class="mb-3">
         <label for="octopush-version" class="form-label">{{ $t("Octopush API Version") }}</label>
         <select id="octopush-version" v-model="$parent.notification.octopushVersion" class="form-select">
-            <option value="2">{{ $t("octopush") }} ({{ $t("endpoint") }}: api.octopush.com)</option>
+            <option value="2">{{ "octopush" }} ({{ $t("endpoint") }}: api.octopush.com)</option>
             <option value="1">{{ $t("Legacy Octopush-DM") }} ({{ $t("endpoint") }}: www.octopush-dm.com)</option>
         </select>
         <div class="form-text">

src/components/notifications/RocketChat.vue

@@ -14,7 +14,7 @@
                 <a href="https://docs.rocket.chat/guides/administration/administration/integrations" target="_blank">https://docs.rocket.chat/guides/administration/administration/integrations</a>
             </i18n-t>
             <p style="margin-top: 8px;">
-                {{ $t("aboutChannelName", [$t("rocket.chat")]) }}
+                {{ $t("aboutChannelName", ["rocket.chat"]) }}
             </p>
             <p style="margin-top: 8px;">
                 {{ $t("aboutKumaURL") }}

src/components/notifications/Slack.vue

@@ -24,7 +24,7 @@
                 <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
             </i18n-t>
             <p style="margin-top: 8px;">
-                {{ $t("aboutChannelName", [$t("slack")]) }}
+                {{ $t("aboutChannelName", ["slack"]) }}
             </p>
             <p style="margin-top: 8px;">
                 {{ $t("aboutKumaURL") }}

src/components/settings/Security.vue

@@ -100,7 +100,7 @@
             </i18n-t>
             <i18n-t tag="p" keypath="disableauth.message2">
                 <template #intendThirdPartyAuth>
-                    <strong>{{ $t('intend to implement third-party authentication') }}</strong>
+                    <strong>{{ $t('where you intend to implement third-party authentication') }}</strong>
                 </template>
             </i18n-t>
             <p>{{ $t("Please use this option carefully!") }}</p>