From 58240aceefb4990b62292c4ee702f4dfd2da1546 Mon Sep 17 00:00:00 2001
From: Ponkhy <xtheponkhx@gmail.com>
Date: Sun, 5 Sep 2021 23:23:06 +0200
Subject: [PATCH 1/9] Added the option for default notifications

---
 db/patch9.sql                         |  7 +++++++
 server/database.js                    |  2 +-
 server/notification.js                | 27 ++++++++++++++++++++++++++-
 src/components/NotificationDialog.vue | 19 +++++++++++++++++++
 src/languages/de-DE.js                |  5 ++++-
 src/languages/en.js                   |  5 ++++-
 src/pages/EditMonitor.vue             |  8 ++++++++
 7 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 db/patch9.sql

diff --git a/db/patch9.sql b/db/patch9.sql
new file mode 100644
index 000000000..3f631ff8b
--- /dev/null
+++ b/db/patch9.sql
@@ -0,0 +1,7 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE notification
+    ADD is_default BOOLEAN;
+
+COMMIT;
diff --git a/server/database.js b/server/database.js
index 77c4da758..832166d2c 100644
--- a/server/database.js
+++ b/server/database.js
@@ -7,7 +7,7 @@ class Database {
     static templatePath = "./db/kuma.db"
     static dataDir;
     static path;
-    static latestVersion = 8;
+    static latestVersion = 9;
     static noReject = true;
     static sqliteInstance = null;
 
diff --git a/server/notification.js b/server/notification.js
index 472012af7..d3a55c841 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -617,8 +617,13 @@ class Notification {
 
         bean.name = notification.name;
         bean.user_id = userID;
-        bean.config = JSON.stringify(notification)
+        bean.config = JSON.stringify(notification);
+        bean.is_default = notification.isDefault;
         await R.store(bean)
+
+        if (notification.applyExisting) {
+            await applyNotificationEveryMonitor(bean.id, userID);
+        }
     }
 
     static async delete(notificationID, userID) {
@@ -702,6 +707,26 @@ function throwGeneralAxiosError(error) {
     throw new Error(msg)
 }
 
+async function applyNotificationEveryMonitor(notificationID, userID) {
+    let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
+        userID
+    ]);
+
+    for (let i = 0; i < monitors.length; i++) {
+        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
+            monitors[i].id,
+            notificationID,
+        ])
+
+        if (! checkNotification) {
+            let relation = R.dispense("monitor_notification");
+            relation.monitor_id = monitors[i].id;
+            relation.notification_id = notificationID;
+            await R.store(relation)
+        }
+    }
+}
+
 module.exports = {
     Notification,
 }
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 2fdb8fe18..fa63a376c 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -469,6 +469,25 @@
                                 First access the <a href="https://developers.line.biz/console/" target="_blank">Line Developers Console</a>, create a provider and channel (Messaging API), then you can get the channel access token and user id from the above mentioned menu items.
                             </div>
                         </template>
+
+                        <div class="mb-3">
+                            <hr class="dropdown-divider">
+
+                            <div class="form-check form-switch">
+                                <input v-model="notification.isDefault" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Default enabled") }}</label>
+                            </div>
+                            <div class="form-text">
+                                {{ $t("enableDefaultNotificationDescription") }}
+                            </div>
+
+                            <br>
+
+                            <div class="form-check form-switch">
+                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Also apply to existing monitors") }}</label>
+                            </div>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 76c355a3b..0889e572c 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -108,5 +108,8 @@ export default {
     "Repeat Password": "Wiederhole das Passwort",
     "Resource Record Type": "Resource Record Type",
     respTime: "Antw. Zeit (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    "Default enabled": "Standardmäßig aktiviert",
+    "Also apply to existing monitors": "Auch für alle existierenden Monitore aktivieren",
+    enableDefaultNotificationDescription: "Für jeden neuen Monitor wird diese Benachrichtigung standardmäßig aktiviert. Die Benachrichtigung kann weiterhin für jeden Monitor separat deaktiviert werden.",
 }
diff --git a/src/languages/en.js b/src/languages/en.js
index f0e4ae969..00d3a7c2f 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -16,6 +16,7 @@ export default {
     resoverserverDescription: "Cloudflare is the default server, you can change the resolver server anytime.",
     rrtypeDescription: "Select the RR-Type you want to monitor",
     pauseMonitorMsg: "Are you sure want to pause?",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
     Settings: "Settings",
     Dashboard: "Dashboard",
     "New Update": "New Update",
@@ -108,5 +109,7 @@ export default {
     "Create your admin account": "Create your admin account",
     "Repeat Password": "Repeat Password",
     respTime: "Resp. Time (ms)",
-    notAvailableShort: "N/A"
+    notAvailableShort: "N/A",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors",
 }
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 552261735..496469f88 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -178,6 +178,8 @@
                                     {{ notification.name }}
                                     <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
                                 </label>
+
+                                <span v-if="notification.isDefault == true" class="badge bg-primary ms-2">Default</span>
                             </div>
 
                             <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
@@ -300,6 +302,12 @@ export default {
                 this.$root.getSocket().emit("getMonitor", this.$route.params.id, (res) => {
                     if (res.ok) {
                         this.monitor = res.monitor;
+
+                        for (let i = 0; i < this.$root.notificationList.length; i++) {
+                            if (this.$root.notificationList[i].isDefault == true) {
+                                this.monitor.notificationIDList[this.$root.notificationList[i].id] = true;
+                            }
+                        }
                     } else {
                         toast.error(res.msg)
                     }

From b95404b6e0f0fff4a13e7f0469c40f47a90e8f5a Mon Sep 17 00:00:00 2001
From: Ponkhy <xtheponkhx@gmail.com>
Date: Sun, 5 Sep 2021 23:23:06 +0200
Subject: [PATCH 2/9] Fixed suggestions

---
 db/patch9.sql             |  2 +-
 src/pages/EditMonitor.vue | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/patch9.sql b/db/patch9.sql
index 3f631ff8b..d4d13aab1 100644
--- a/db/patch9.sql
+++ b/db/patch9.sql
@@ -2,6 +2,6 @@
 BEGIN TRANSACTION;
 
 ALTER TABLE notification
-    ADD is_default BOOLEAN;
+    ADD is_default BOOLEAN default 0 NOT NULL;
 
 COMMIT;
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 496469f88..ed09a7bad 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -298,16 +298,16 @@ export default {
                     dns_resolve_type: "A",
                     dns_resolve_server: "1.1.1.1",
                 }
+
+                for (let i = 0; i < this.$root.notificationList.length; i++) {
+                    if (this.$root.notificationList[i].isDefault == true) {
+                        this.monitor.notificationIDList[this.$root.notificationList[i].id] = true;
+                    }
+                }
             } else if (this.isEdit) {
                 this.$root.getSocket().emit("getMonitor", this.$route.params.id, (res) => {
                     if (res.ok) {
                         this.monitor = res.monitor;
-
-                        for (let i = 0; i < this.$root.notificationList.length; i++) {
-                            if (this.$root.notificationList[i].isDefault == true) {
-                                this.monitor.notificationIDList[this.$root.notificationList[i].id] = true;
-                            }
-                        }
                     } else {
                         toast.error(res.msg)
                     }

From f0f1847ad8347f035df819687e3c21e831f2b63d Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Tue, 7 Sep 2021 23:53:20 +0800
Subject: [PATCH 3/9] update language files

---
 src/languages/da-DK.js   | 5 ++++-
 src/languages/es-ES.js   | 5 ++++-
 src/languages/fr-FR.js   | 5 ++++-
 src/languages/ja.js      | 5 ++++-
 src/languages/ko-KR.js   | 5 ++++-
 src/languages/nl-NL.js   | 5 ++++-
 src/languages/pl.js      | 5 ++++-
 src/languages/ru-RU.js   | 5 ++++-
 src/languages/sr-latn.js | 5 ++++-
 src/languages/sr.js      | 5 ++++-
 src/languages/sv-SE.js   | 5 ++++-
 src/languages/zh-CN.js   | 5 ++++-
 src/languages/zh-HK.js   | 5 ++++-
 13 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/languages/da-DK.js b/src/languages/da-DK.js
index c8e4e68fd..10c4ced7e 100644
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/es-ES.js b/src/languages/es-ES.js
index 035608483..55fd4bc28 100644
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index dca82ac25..bc5c6adc3 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/ja.js b/src/languages/ja.js
index d7b4e6e2a..23a058aa0 100644
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/ko-KR.js b/src/languages/ko-KR.js
index d57dcbd7e..8432ac1ad 100644
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js
index ef2305ca5..19d9535b3 100644
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/pl.js b/src/languages/pl.js
index 74137dbbf..8e5fb58c8 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index 1cea0567f..f8600466c 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/sr-latn.js b/src/languages/sr-latn.js
index 46a6efec7..c22f11d04 100644
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/sr.js b/src/languages/sr.js
index c46244ada..ac8b3b026 100644
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/sv-SE.js b/src/languages/sv-SE.js
index a07396678..aa4d78f83 100644
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index d837aced5..c1e59b0c9 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "Clear Data",
     Events: "Events",
     Heartbeats: "Heartbeats",
-    "Auto Get": "Auto Get"
+    "Auto Get": "Auto Get",
+    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    "Default enabled": "Default enabled",
+    "Also apply to existing monitors": "Also apply to existing monitors"
 }
diff --git a/src/languages/zh-HK.js b/src/languages/zh-HK.js
index d7aa9de88..c70248bb1 100644
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@@ -116,5 +116,8 @@ export default {
     "Clear Data": "清除資料",
     Events: "事件",
     Heartbeats: "脈搏",
-    "Auto Get": "自動獲取"
+    "Auto Get": "自動獲取",
+    enableDefaultNotificationDescription: "新增監測器時這個通知會預設啟用，當然每個監測器亦可分別控制開關。",
+    "Default enabled": "預設通知",
+    "Also apply to existing monitors": "同時取用至目前所有監測器"
 }

From 2c3880a326b5bcdbc31a68c641322aec14937eb6 Mon Sep 17 00:00:00 2001
From: jtagcat <git-12dbd862@jtag.cat>
Date: Tue, 7 Sep 2021 11:38:12 +0300
Subject: [PATCH 4/9] Added Estonian.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - "Avg.": using ≈, as it's commonly enough known.
   There is no known shorthand for 'average' that I know of.

- Leaved some strings empty, as repeating the same words is useless, just noise.
---
 src/languages/et-EE.js | 112 +++++++++++++++++++++++++++++++++++++++++
 src/main.js            |   2 +
 src/pages/Settings.vue |   5 ++
 3 files changed, 119 insertions(+)
 create mode 100644 src/languages/et-EE.js

diff --git a/src/languages/et-EE.js b/src/languages/et-EE.js
new file mode 100644
index 000000000..28ebdb71b
--- /dev/null
+++ b/src/languages/et-EE.js
@@ -0,0 +1,112 @@
+export default {
+    languageName: "eesti",
+    checkEverySecond: "Kontrolli {0} sekundilise vahega.",
+    "Avg.": "≈ ",
+    retriesDescription: "Mitu korda tuleb kontrollida, mille järel märkida 'maas' ja saata välja teavitus.",
+    ignoreTLSError: "Eira TLS/SSL viga HTTPS veebisaitidel.",
+    upsideDownModeDescription: "Käitle teenuse saadavust rikkena, teenuse kättesaamatust töötavaks.",
+    maxRedirectDescription: "Suurim arv ümbersuunamisi, millele järgida. 0 ei luba ühtegi ",
+    acceptedStatusCodesDescription: "Vali välja HTTP koodid, mida arvestada kõlblikuks.",
+    passwordNotMatchMsg: "Salasõnad ei kattu.",
+    notificationDescription: "Teavitusmeetodi kasutamiseks seo see seirega.",
+    keywordDescription: "Jälgi võtmesõna HTML või JSON vastustes. (tõstutundlik)",
+    pauseDashboardHome: "Seiskamine",
+    deleteMonitorMsg: "Kas soovid eemaldada seire?",
+    deleteNotificationMsg: "Kas soovid eemaldada selle teavitusmeetodi kõikidelt seiretelt?",
+    resoverserverDescription: "Cloudflare on vaikimisi pöördserver.",
+    rrtypeDescription: "Vali kirje tüüp, mida soovid jälgida.",
+    pauseMonitorMsg: "Kas soovid peatada seire?",
+    Settings: "Seaded",
+    Dashboard: "Töölaud",
+    "New Update": "Uuem tarkvara versioon on saadaval.",
+    Language: "Keel",
+    Appearance: "Välimus",
+    Theme: "Teema",
+    General: "Üldine",
+    Version: "Versioon",
+    "Check Update On GitHub": "Otsi uuendusi GitHub'ist",
+    List: "Nimekiri",
+    Add: "Lisa",
+    "Add New Monitor": "Seire lisamine",
+    "Quick Stats": "Ülevaade",
+    Up: "Töökorras",
+    Down: "Rikkis",
+    Pending: "Määramisel",
+    Unknown: "Teadmata",
+    Pause: "Seiskamine",
+    Name: "Nimi",
+    Status: "Olek",
+    DateTime: "Kuupäev",
+    Message: "Tulemus",
+    "No important events": "Märkimisväärsed juhtumid puuduvad.",
+    Resume: "Taasta",
+    Edit: "Muutmine",
+    Delete: "Eemalda",
+    Current: "Hetkeseisund",
+    Uptime: "Eluiga",
+    "Cert Exp.": "Sert. aegumine",
+    days: "päeva",
+    day: "päev",
+    "-day": "-päev",
+    hour: "tund",
+    "-hour": "-tund",
+    Response: "Vastus",
+    Ping: "Ping",
+    "Monitor Type": "Seire tüüp",
+    Keyword: "Võtmesõna",
+    "Friendly Name": "Sõbralik nimi",
+    URL: "URL",
+    Hostname: "Hostname",
+    Port: "Port",
+    "Heartbeat Interval": "Tukse sagedus",
+    Retries: "Korduskatsed",
+    Advanced: "Rohkem",
+    "Upside Down Mode": "Tagurpidi seire",
+    "Max. Redirects": "Max. ümbersuunamine",
+    "Accepted Status Codes": "Kõlblikud HTTP koodid",
+    Save: "Salvesta",
+    Notifications: "Teavitused",
+    "Not available, please setup.": "Ühtegi teavitusteenust pole saadaval.",
+    "Setup Notification": "Lisa teavitusteenus",
+    Light: "hele",
+    Dark: "tume",
+    Auto: "automaatne",
+    "Theme - Heartbeat Bar": "Teemasäte — tuksete riba",
+    Normal: "tavaline",
+    Bottom: "all",
+    None: "puudub",
+    Timezone: "Ajatsoon",
+    "Search Engine Visibility": "Otsimootorite ligipääs",
+    "Allow indexing": "Luba indekseerimine",
+    "Discourage search engines from indexing site": "Keela selle saidi indekseerimine otsimootorite poolt",
+    "Change Password": "Muuda parooli",
+    "Current Password": "praegune parool",
+    "New Password": "uus parool",
+    "Repeat New Password": "korda salasõna",
+    "Update Password": "Uuenda salasõna",
+    "Disable Auth": "Lülita autentimine välja",
+    "Enable Auth": "Lülita autentimine sisse",
+    Logout: "Logi välja",
+    Leave: "Lahku",
+    "I understand, please disable": "Olen tutvunud riskidega, lülita välja",
+    Confirm: "Kinnita",
+    Yes: "Jah",
+    No: "Ei",
+    Username: "kasutajanimi",
+    Password: "parool",
+    "Remember me": "Mäleta mind",
+    Login: "Logi sisse",
+    "No Monitors, please": "Seired puuduvad.",
+    "add one": "Lisa esimene",
+    "Notification Type": "Teavituse tüüp",
+    Email: "e-posti aadress",
+    Test: "Saada prooviteavitus",
+    "Certificate Info": "Sertifikaadi teave",
+    "Resolver Server": "Server, mis vastab DNS päringutele.",
+    "Resource Record Type": "DNS kirje tüüp",
+    "Last Result": "Viimane",
+    "Create your admin account": "Admininstraatori konto loomine",
+    "Repeat Password": "korda salasõna",
+    respTime: "Reageerimisaeg (ms)",
+    notAvailableShort: "N/A"
+}
diff --git a/src/main.js b/src/main.js
index f34e9c43d..26b0c1c8f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,7 @@ import koKR from "./languages/ko-KR";
 import ruRU from "./languages/ru-RU";
 import zhCN from "./languages/zh-CN";
 import pl from "./languages/pl"
+import etEE from "./languages/et-EE"
 
 const routes = [
     {
@@ -116,6 +117,7 @@ const languageList = {
     "ru-RU": ruRU,
     "zh-CN": zhCN,
     "pl": pl,
+    "et-EE": etEE,
 };
 
 const i18n = createI18n({
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 83384ca80..acccca3e9 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -218,6 +218,11 @@
                     <p>Jest przeznaczony dla <strong>kogoś, kto ma autoryzację zewnętrzną</strong> przed Uptime Kuma, taką jak Cloudflare Access.</p>
                     <p>Proszę używać ostrożnie.</p>
                 </template>
+                <template v-if="$i18n.locale === 'et-EE' ">
+                    <p>Kas soovid <strong>lülitada autentimise välja</strong>?</p>
+                    <p>Kastuamiseks <strong>välise autentimispakkujaga</strong>, näiteks Cloudflare Access.</p>
+                    <p>Palun kasuta vastutustundlikult.</p>
+                </template>
             </Confirm>
         </div>
     </transition>

From c1aebef00575c7c862d05edb3b02f57f6ca6b085 Mon Sep 17 00:00:00 2001
From: Ponkhy <github@myon.lu>
Date: Wed, 8 Sep 2021 01:03:24 +0200
Subject: [PATCH 5/9] Fixed SQL error due notification setup

---
 src/components/NotificationDialog.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index ba7397ca1..2878c500b 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -504,6 +504,7 @@ export default {
                 name: "",
                 type: null,
                 gotifyPriority: 8,
+                isDefault: false,
             },
             appriseInstalled: false,
         }
@@ -553,6 +554,7 @@ export default {
                 this.notification = {
                     name: "",
                     type: null,
+                    isDefault: false,
                 }
 
                 // Default set to Telegram

From 678e24896612e4d4a086418ea0db3ec374194226 Mon Sep 17 00:00:00 2001
From: Ponkhy <github@myon.lu>
Date: Wed, 8 Sep 2021 01:10:19 +0200
Subject: [PATCH 6/9] Added indicator while changing database records

---
 src/components/NotificationDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 2878c500b..6d4728f6a 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -464,6 +464,7 @@
                             {{ $t("Test") }}
                         </button>
                         <button type="submit" class="btn btn-primary" :disabled="processing">
+                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
                             {{ $t("Save") }}
                         </button>
                     </div>

From f7562e00c193a27d3bb6e5dbbf7b707d090ae06e Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 8 Sep 2021 10:25:03 +0800
Subject: [PATCH 7/9] improve notification component, no double template

---
 src/components/NotificationDialog.vue     |  2 +-
 src/components/notifications/Telegram.vue | 62 +++++++++++------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 8a05d66ef..ebc8eec35 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -37,7 +37,7 @@
                             <input id="name" v-model="notification.name" type="text" class="form-control" required>
                         </div>
 
-                        <Telegram></Telegram>
+                        <Telegram v-if="notification.type === 'telegram'"></Telegram>
 
                         <!-- TODO: Convert all into vue components, but not an easy task.  -->
 
diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 537b7fd34..9be1e004f 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -1,42 +1,40 @@
 <template>
-    <template v-if="$parent.notification.type === name">
-        <div class="mb-3">
-            <label for="telegram-bot-token" class="form-label">Bot Token</label>
-            <HiddenInput id="telegram-bot-token" v-model="$parent.notification.telegramBotToken" :required="true" autocomplete="one-time-code"></HiddenInput>
-            <div class="form-text">
-                You can get a token from <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>.
-            </div>
+    <div class="mb-3">
+        <label for="telegram-bot-token" class="form-label">Bot Token</label>
+        <HiddenInput id="telegram-bot-token" v-model="$parent.notification.telegramBotToken" :required="true" autocomplete="one-time-code"></HiddenInput>
+        <div class="form-text">
+            You can get a token from <a href="https://t.me/BotFather" target="_blank">https://t.me/BotFather</a>.
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="telegram-chat-id" class="form-label">Chat ID</label>
+
+        <div class="input-group mb-3">
+            <input id="telegram-chat-id" v-model="$parent.notification.telegramChatID" type="text" class="form-control" required>
+            <button v-if="$parent.notification.telegramBotToken" class="btn btn-outline-secondary" type="button" @click="autoGetTelegramChatID">
+                {{ $t("Auto Get") }}
+            </button>
         </div>
 
-        <div class="mb-3">
-            <label for="telegram-chat-id" class="form-label">Chat ID</label>
+        <div class="form-text">
+            Support Direct Chat / Group / Channel's Chat ID
 
-            <div class="input-group mb-3">
-                <input id="telegram-chat-id" v-model="$parent.notification.telegramChatID" type="text" class="form-control" required>
-                <button v-if="$parent.notification.telegramBotToken" class="btn btn-outline-secondary" type="button" @click="autoGetTelegramChatID">
-                    {{ $t("Auto Get") }}
-                </button>
-            </div>
+            <p style="margin-top: 8px;">
+                You can get your chat id by sending message to the bot and go to this url to view the chat_id:
+            </p>
 
-            <div class="form-text">
-                Support Direct Chat / Group / Channel's Chat ID
+            <p style="margin-top: 8px;">
+                <template v-if="$parent.notification.telegramBotToken">
+                    <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
+                </template>
 
-                <p style="margin-top: 8px;">
-                    You can get your chat id by sending message to the bot and go to this url to view the chat_id:
-                </p>
-
-                <p style="margin-top: 8px;">
-                    <template v-if="$parent.notification.telegramBotToken">
-                        <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
-                    </template>
-
-                    <template v-else>
-                        {{ telegramGetUpdatesURL }}
-                    </template>
-                </p>
-            </div>
+                <template v-else>
+                    {{ telegramGetUpdatesURL }}
+                </template>
+            </p>
         </div>
-    </template>
+    </div>
 </template>
 
 <script>

From 2212cf9c087ed11b7ffbf5a085ff0d85a75eec4e Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 8 Sep 2021 10:28:40 +0800
Subject: [PATCH 8/9] fix confirmDisableAuth no msg if not tranlated

---
 src/pages/Settings.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 151df2c4d..0c1625c54 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -167,58 +167,59 @@
             <NotificationDialog ref="notificationDialog" />
 
             <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
-                <template v-if="$i18n.locale === 'en' ">
-                    <p>Are you sure want to <strong>disable auth</strong>?</p>
-                    <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>
-                    <p>Please use it carefully.</p>
-                </template>
-
                 <template v-if="$i18n.locale === 'es-ES' ">
                     <p>Seguro que deseas <strong>deshabilitar la autenticación</strong>?</p>
                     <p>Es para <strong>quien implementa autenticación de terceros</strong> ante Uptime Kuma como por ejemplo Cloudflare Access.</p>
                     <p>Por favor usar con cuidado.</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'zh-HK' ">
+                <template v-else-if="$i18n.locale === 'zh-HK' ">
                     <p>你是否確認<strong>取消登入認証</strong>？</p>
                     <p>這個功能是設計給已有<strong>第三方認証</strong>的用家，例如 Cloudflare Access。</p>
                     <p>請小心使用。</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'zh-CN' ">
+                <template v-else-if="$i18n.locale === 'zh-CN' ">
                     <p>是否确定 <strong>取消登录验证</strong>？</p>
                     <p>这是为 <strong>有第三方认证</strong> 的用户提供的功能，如 Cloudflare Access</p>
                     <p>请谨慎使用！</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'de-DE' ">
+                <template v-else-if="$i18n.locale === 'de-DE' ">
                     <p>Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?</p>
                     <p>Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.</p>
                     <p>Bitte mit Vorsicht nutzen.</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'sr' ">
+                <template v-else-if="$i18n.locale === 'sr' ">
                     <p>Да ли сте сигурни да желите да <strong>искључите аутентификацију</strong>?</p>
                     <p>То је за <strong>оне који имају додату аутентификацију</strong> испред Uptime Kuma као на пример Cloudflare Access.</p>
                     <p>Молим Вас користите ово са пажњом.</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'sr-latn' ">
+                <template v-else-if="$i18n.locale === 'sr-latn' ">
                     <p>Da li ste sigurni da želite da <strong>isključite autentifikaciju</strong>?</p>
                     <p>To je za <strong>one koji imaju dodatu autentifikaciju</strong> ispred Uptime Kuma kao na primer Cloudflare Access.</p>
                     <p>Molim Vas koristite ovo sa pažnjom.</p>
                 </template>
 
-                <template v-if="$i18n.locale === 'ko-KR' ">
+                <template v-else-if="$i18n.locale === 'ko-KR' ">
                     <p>정말로 <strong>인증 기능을 끌까요</strong>?</p>
                     <p>이 기능은 <strong>Cloudflare Access와 같은 서드파티 인증</strong>을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.</p>
                     <p>신중하게 사용하세요.</p>
                 </template>
-                <template v-if="$i18n.locale === 'pl' ">
+
+                <template v-else-if="$i18n.locale === 'pl' ">
                     <p>Czy na pewno chcesz <strong>wyłączyć autoryzację</strong>?</p>
                     <p>Jest przeznaczony dla <strong>kogoś, kto ma autoryzację zewnętrzną</strong> przed Uptime Kuma, taką jak Cloudflare Access.</p>
                     <p>Proszę używać ostrożnie.</p>
                 </template>
+
+                <template v-else>
+                    <p>Are you sure want to <strong>disable auth</strong>?</p>
+                    <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>
+                    <p>Please use it carefully.</p>
+                </template>
             </Confirm>
 
             <Confirm ref="confirmClearStatistics" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="clearStatistics">

From f2cec6048178a6a4c88ddfaadc8552a46f78d797 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 8 Sep 2021 10:48:03 +0800
Subject: [PATCH 9/9] minor

---
 src/pages/Settings.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 0c1625c54..b34228d0c 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -215,6 +215,7 @@
                     <p>Proszę używać ostrożnie.</p>
                 </template>
 
+                <!-- English (en) -->
                 <template v-else>
                     <p>Are you sure want to <strong>disable auth</strong>?</p>
                     <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>