Move attribute tag to start of tag

src/components/notifications/Apprise.vue

@@ -4,15 +4,15 @@
         <input id="apprise-url" v-model="$parent.notification.appriseURL" type="text" class="form-control" required>
         <div class="form-text">
             <p>{{ $t("Example:", ["twilio://AccountSid:AuthToken@FromPhoneNo"]) }}</p>
-            <i18n-t keypath="Read more:" tag="p">
+            <i18n-t tag="p" keypath="Read more:">
                 <a href="https://github.com/caronc/apprise/wiki#notification-services" target="_blank">https://github.com/caronc/apprise/wiki#notification-services</a>
             </i18n-t>
         </div>
     </div>
     <div class="mb-3">
-        <i18n-t keypath="Status:" tag="p">
+        <i18n-t tag="p" keypath="Status:">
             <span v-if="appriseInstalled" class="text-primary">{{ $t("appriseInstalled") }}</span>
-            <i18n-t v-else keypath="appriseNotInstalled" tag="span" class="text-danger">
+            <i18n-t v-else tag="span" keypath="appriseNotInstalled" class="text-danger">
                 <a href="https://github.com/caronc/apprise" target="_blank">{{ $t("Read more") }}</a>
             </i18n-t>
         </i18n-t>
@@ -24,12 +24,12 @@ export default {
     data() {
         return {
             appriseInstalled: false
-        }
+        };
     },
     mounted() {
         this.$root.getSocket().emit("checkApprise", (installed) => {
             this.appriseInstalled = installed;
-        })
+        });
     },
-}
+};
 </script>

src/components/notifications/Line.vue

@@ -3,17 +3,17 @@
         <label for="line-channel-access-token" class="form-label">{{ $t("Channel access token") }}</label>
         <HiddenInput id="line-channel-access-token" v-model="$parent.notification.lineChannelAccessToken" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
-    <i18n-t keypath="lineDevConsoleTo" tag="div" class="form-text">
+    <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
         <b>{{ $t("Basic Settings") }}</b>
     </i18n-t>
     <div class="mb-3" style="margin-top: 12px;">
         <label for="line-user-id" class="form-label">User ID</label>
         <input id="line-user-id" v-model="$parent.notification.lineUserID" type="text" class="form-control" required>
     </div>
-    <i18n-t keypath="lineDevConsoleTo" tag="div" class="form-text">
+    <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
         <b>{{ $t("Messaging API") }}</b>
     </i18n-t>
-    <i18n-t keypath="wayToGetLineChannelToken" tag="div" class="form-text" style="margin-top: 8px;">
+    <i18n-t tag="div" keypath="wayToGetLineChannelToken" class="form-text" style="margin-top: 8px;">
         <a href="https://developers.line.biz/console/" target="_blank">{{ $t("Line Developers Console") }}</a>
     </i18n-t>
 </template>
@@ -25,5 +25,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>

src/components/notifications/Mattermost.vue

@@ -12,7 +12,7 @@
         <input id="mattermost-channel-name" v-model="$parent.notification.mattermostchannel" type="text" class="form-control">
         <div class="form-text">
             <span style="color:red;"><sup>*</sup></span>{{ $t("Required") }}
-            <i18n-t keypath="aboutWebhooks" tag="p" style="margin-top: 8px;">
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">https://docs.mattermost.com/developer/webhooks-incoming.html</a>
             </i18n-t>
             <p style="margin-top: 8px;">
@@ -24,7 +24,7 @@
             <p style="margin-top: 8px;">
                 {{ $t("aboutIconURL") }}
             </p>
-            <i18n-t keypath="emojiCheatSheet" tag="p" style="margin-top: 8px;">
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
                 <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
             </i18n-t>
         </div>

src/components/notifications/Octopush.vue

@@ -11,7 +11,7 @@
             <option value="sms_premium">{{ $t("octopushTypePremium") }}</option>
             <option value="sms_low_cost">{{ $t("octopushTypeLowCost") }}</option>
         </select>
-        <i18n-t keypath="Check octopush prices" tag="div" class="form-text">
+        <i18n-t tag="div" keypath="Check octopush prices" class="form-text">
             <a href="https://octopush.com/tarifs-sms-international/" target="_blank">https://octopush.com/tarifs-sms-international/</a>
         </i18n-t>
     </div>
@@ -24,7 +24,7 @@
         <input id="octopush-sender-name" v-model="$parent.notification.octopushSenderName" type="text" minlength="3" maxlength="11" class="form-control">
     </div>
 
-    <i18n-t keypath="More info on:" tag="p" style="margin-top: 8px;">
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
         <a href="https://octopush.com/api-sms-documentation/envoi-de-sms/" target="_blank">https://octopush.com/api-sms-documentation/envoi-de-sms/</a>
     </i18n-t>
 </template>
@@ -36,5 +36,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>

src/components/notifications/Pushbullet.vue

@@ -4,7 +4,7 @@
         <HiddenInput id="pushbullet-access-token" v-model="$parent.notification.pushbulletAccessToken" :required="true" autocomplete="one-time-code"></HiddenInput>
     </div>
 
-    <i18n-t keypath="More info on:" tag="p" style="margin-top: 8px;">
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
         <a href="https://docs.pushbullet.com" target="_blank">https://docs.pushbullet.com</a>
     </i18n-t>
 </template>
@@ -16,5 +16,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>

src/components/notifications/Pushover.vue

@@ -43,7 +43,7 @@
         </select>
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
-            <i18n-t keypath="More info on:" tag="p" style="margin-top: 8px;">
+            <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
                 <a href="https://pushover.net/api" target="_blank">https://pushover.net/api</a>
             </i18n-t>
             <p style="margin-top: 8px;">

src/components/notifications/Pushy.vue

@@ -10,7 +10,7 @@
             <HiddenInput id="pushy-user-key" v-model="$parent.notification.pushyToken" :required="true" autocomplete="one-time-code"></HiddenInput>
         </div>
     </div>
-    <i18n-t keypath="More info on:" tag="p" style="margin-top: 8px;">
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
         <a href="https://pushy.me/docs/api/send-notifications" target="_blank">https://pushy.me/docs/api/send-notifications</a>
     </i18n-t>
 </template>
@@ -22,5 +22,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>

src/components/notifications/RocketChat.vue

@@ -12,7 +12,7 @@
         <input id="rocket-button" v-model="$parent.notification.rocketbutton" type="text" class="form-control">
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
-            <i18-t keypath="aboutWebhooks" tag="p" style="margin-top: 8px;">
+            <i18-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://docs.rocket.chat/guides/administration/administration/integrations" target="_blank">https://api.slack.com/messaging/webhooks</a>
             </i18-t>
             <p style="margin-top: 8px;">
@@ -21,7 +21,7 @@
             <p style="margin-top: 8px;">
                 {{ $t("aboutKumaURL") }}
             </p>
-            <i18n-t keypath="emojiCheatSheet" tag="p" style="margin-top: 8px;">
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
                 <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
             </i18n-t>
         </div>

src/components/notifications/Slack.vue

@@ -12,7 +12,7 @@
         <input id="slack-button" v-model="$parent.notification.slackbutton" type="text" class="form-control">
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
-            <i18-t keypath="aboutWebhooks" tag="p" style="margin-top: 8px;">
+            <i18-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
             </i18-t>
             <p style="margin-top: 8px;">
@@ -21,7 +21,7 @@
             <p style="margin-top: 8px;">
                 {{ $t("aboutKumaURL") }}
             </p>
-            <i18n-t keypath="emojiCheatSheet" tag="p" style="margin-top: 8px;">
+            <i18n-t tag="p" keypath="emojiCheatSheet" style="margin-top: 8px;">
                 <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
             </i18n-t>
         </div>

src/components/notifications/Teams.vue

@@ -8,7 +8,7 @@
             class="form-control"
             required
         />
-        <i18n-t keypath="wayToGetTeamsURL" class="form-text" tag="div">
+        <i18n-t tag="div" keypath="wayToGetTeamsURL" class="form-text">
             <a
                 href="https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook"
                 target="_blank"

src/components/notifications/Webhook.vue

@@ -17,7 +17,7 @@
 
         <div class="form-text">
             <p>"application/json" is good for any modern http servers such as express.js</p>
-            <i18n-t keypath="webhookFormDataDesc" tag="p">
+            <i18n-t tag="p" keypath="webhookFormDataDesc">
                 "multipart/form-data"
                 <strong>json_decode($_POST['data'])</strong>
             </i18n-t>

src/languages/en.js

@@ -182,7 +182,6 @@ export default {
     defaultNotificationName: "My {0} Alert ({1})",
     here: "here",
     "Required": "Required",
-
     "telegram": "Telegram",
     "Bot Token": "Bot Token",
     "You can get a token from": "You can get a token from",
@@ -191,13 +190,11 @@ export default {
     wayToGetTelegramChatID: "You can get your chat id by sending message to the bot and go to this url to view the chat_id:",
     "YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",
     chatIDNotFound: "Chat ID is not found, please send a message to this bot first",
-
     "webhook": "Webhook",
     "Post URL": "Post URL",
     "Content Type": "Content Type",
     webhookJsonDesc: "{0} is good for any modern http servers such as express.js",
     webhookFormDataDesc: "{0} is good for PHP, you just need to parse the json by {1}",
-
     "smtp": "Email (SMTP)",
     secureOptionNone: "None / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
@@ -206,30 +203,25 @@ export default {
     "To Email": "To Email",
     smtpCC: "CC",
     smtpBCC: "BCC",
-
     "discord": "Discord",
     "Discord Webhook URL": "Discord Webhook URL",
     wayToGetDiscordURL: "You can get this by going to Server Settings -> Integrations -> Create Webhook",
     "Bot Display Name": "Bot Display Name",
     "Prefix Custom Message": "Prefix Custom Message",
     "Hello @everyone is...": "Hello @everyone is...",
-
     "teams": "Microsoft Teams",
     "Webhook URL": "Webhook URL",
     wayToGetTeamsURL: "You can learn how to create a webhook url {0}.",
-
     "signal": "Signal",
     "Number": "Number",
     "Recipients": "Recipients",
     needSignalAPI: "You need to have a signal client with REST API.",
     wayToCheckSignalURL: "You can check this url to view how to setup one:",
     signalImportant: "IMPORTANT: You cannot mix groups and numbers in recipients!",
-
     "gotify": "Gotify",
     "Application Token": "Application Token",
     "Server URL": "Server URL",
     "Priority": "Priority",
-
     "slack": "Slack",
     "Icon Emoji": "Icon Emoji",
     "Channel Name": "Channel Name",
@@ -238,9 +230,7 @@ export default {
     aboutChannelName: "Enter the channel name on {0} Channel Name field if you want to bypass the webhook channel. Ex: #other-channel",
     aboutKumaURL: "If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.",
     emojiCheatSheet: "Emoji cheat sheet: {0}",
-
     "rocket.chat": "Rocket.chat",
-
     "pushover": "Pushover",
     "User Key": "User Key",
     "Device": "Device",
@@ -249,9 +239,7 @@ export default {
     "More info on:": "More info on: {0}",
     pushoverDesc1: "Emergency priority (2) has default 30 second timeout between retries and will expire after 1 hour.",
     pushoverDesc2: "If you want to send notifications to different devices, fill out Device field.",
-
     "pushy": "Pushy",
-
     "octopush": "Octopush",
     "SMS Type": "SMS Type",
     octopushTypePremium: "Premium (Fast - recommended for alerting)",
@@ -259,10 +247,8 @@ export default {
     "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)",
-
     "lunasea": "LunaSea",
     "LunaSea Device ID": "LunaSea Device ID",
-
     "apprise": "Apprise (Support 50+ Notification services)",
     "Apprise URL": "Apprise URL",
     "Example:": "Example: {0}",
@@ -271,10 +257,8 @@ export default {
     "Read more": "Read more",
     appriseInstalled: "Apprise is installed.",
     appriseNotInstalled: "Apprise is not installed. {0}",
-
     "pushbullet": "Pushbullet",
     "Access Token": "Access Token",
-
     "line": "Line Messenger",
     "Channel access token": "Channel access token",
     "Line Developers Console": "Line Developers Console",
@@ -283,7 +267,6 @@ export default {
     "User ID": "User ID",
     "Messaging API": "Messaging API",
     wayToGetLineChannelToken: "First access the {0}, create a provider and channel (Messaging API), then you can get the channel access token and user id from the above mentioned menu items.",
-
     "mattermost": "Mattermost",
     "Icon URL": "Icon URL",
     aboutIconURL: "You can provide a link to a picture in \"Icon URL\" to override the default profile picture. Will not be used if Icon Emoji is set.",