Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer

src/components/settings/MonitorHistory.vue

@@ -7,6 +7,7 @@
                         settings.keepDataPeriodDays,
                     ])
                 }}
+                {{ $t("infiniteRetention") }}
             </label>
             <input
                 id="keepDataPeriodDays"
@@ -14,9 +15,12 @@
                 type="number"
                 class="form-control"
                 required
-                min="1"
+                min="0"
                 step="1"
             />
+            <div v-if="settings.keepDataPeriodDays < 0" class="form-text">
+                {{ $t("dataRetentionTimeError") }}
+            </div>
         </div>
         <div class="my-4">
             <button class="btn btn-primary" type="button" @click="saveSettings()">

src/languages/bg-BG.js

@@ -669,4 +669,10 @@ export default {
     "General Monitor Type": "Общ тип монитор",
     "Passive Monitor Type": "Пасивет тип монитор",
     "Specific Monitor Type": "Специфичен тип монитор",
+    ZohoCliq: "ZohoCliq",
+    wayToGetZohoCliqURL: "Можете да научите как се създава URL адрес за уеб кука {0}.",
+    Kook: "Kook",
+    wayToGetKookBotToken: "Създайте приложение и вземете вашия бот токен на {0}",
+    wayToGetKookGuildID: "Превключете в 'Developer Mode' в 'Kook' настройките, след което десен клик върху 'guild' за да вземете неговото 'ID'",
+    "Guild ID": "Guild ID",
 };

src/languages/en.js

@@ -676,4 +676,6 @@ export default {
     "Passive Monitor Type": "Passive Monitor Type",
     "Specific Monitor Type": "Specific Monitor Type",
     markdownSupported: "Markdown syntax supported",
+    dataRetentionTimeError: "Retention period must be 0 or greater",
+    infiniteRetention: "Set to 0 for infinite retention.",
 };

src/languages/fr-FR.js

@@ -209,6 +209,7 @@ export default {
     here: "ici",
     Required: "Requis",
     telegram: "Telegram",
+    "ZohoCliq": "ZohoCliq",
     "Bot Token": "Jeton du robot",
     wayToGetTelegramToken: "Vous pouvez obtenir un token depuis {0}.",
     "Chat ID": "Chat ID",
@@ -240,7 +241,8 @@ export default {
     "Hello @everyone is...": "Bonjour {'@'}everyone il...",
     teams: "Microsoft Teams",
     "Webhook URL": "URL vers le webhook",
-    wayToGetTeamsURL: "Vous pouvez apprendre comment créer un Webhook {0}.",
+    wayToGetTeamsURL: "Vous pouvez apprendre comment créer une URL Webhook {0}.",
+    wayToGetZohoCliqURL: "Vous pouvez apprendre comment créer une URL Webhook {0}.",
     signal: "Signal",
     Number: "Numéro",
     Recipients: "Destinataires",
@@ -270,6 +272,10 @@ export default {
     apprise: "Apprise (prend en charge plus de 50 services de notification)",
     GoogleChat: "Google Chat (Google Workspace uniquement)",
     pushbullet: "Pushbullet",
+    Kook: "Kook",
+    wayToGetKookBotToken: "Créez une application et récupérer le jeton de robot à l'addresse {0}",
+    wayToGetKookGuildID: "Passez en « mode développeur » dans les paramètres de Kook, et cliquez droit sur le Guild pour obtenir son identifiant",
+    "Guild ID": "Identifiant de Guild",
     line: "Line Messenger",
     mattermost: "Mattermost",
     "User Key": "Clé d'utilisateur",

src/pages/Settings.vue

@@ -189,14 +189,36 @@ export default {
          * @param {string} [currentPassword] Only need for disableAuth to true
          */
         saveSettings(callback, currentPassword) {
-            this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
-                this.$root.toastRes(res);
-                this.loadSettings();
+            let valid = this.validateSettings();
+            if (valid.success) {
+                this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
+                    this.$root.toastRes(res);
+                    this.loadSettings();
 
-                if (callback) {
-                    callback();
-                }
-            });
+                    if (callback) {
+                        callback();
+                    }
+                });
+            } else {
+                this.$root.toastError(valid.msg);
+            }
+        },
+
+        /**
+         * Ensure settings are valid
+         * @returns {Object} Contains success state and error msg
+         */
+        validateSettings() {
+            if (this.settings.keepDataPeriodDays < 0) {
+                return {
+                    success: false,
+                    msg: this.$t("dataRetentionTimeError"),
+                };
+            }
+            return {
+                success: true,
+                msg: "",
+            };
         },
     }
 };