From 22106e3da998e5630c1292f2e65dbdeabfb73cbc Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 20:51:34 +0100
Subject: [PATCH 01/18] translate aria-label close tags

---
 src/components/APIKeyDialog.vue         | 4 ++--
 src/components/BadgeGeneratorDialog.vue | 2 +-
 src/components/Confirm.vue              | 2 +-
 src/components/CreateGroupDialog.vue    | 2 +-
 src/components/DockerHostDialog.vue     | 2 +-
 src/components/MonitorSettingDialog.vue | 2 +-
 src/components/NotificationDialog.vue   | 2 +-
 src/components/ProxyDialog.vue          | 2 +-
 src/components/RemoteBrowserDialog.vue  | 2 +-
 src/components/ScreenshotDialog.vue     | 2 +-
 src/components/TagEditDialog.vue        | 2 +-
 src/components/TwoFADialog.vue          | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/APIKeyDialog.vue b/src/components/APIKeyDialog.vue
index a103cf097..6e77c0245 100644
--- a/src/components/APIKeyDialog.vue
+++ b/src/components/APIKeyDialog.vue
@@ -7,7 +7,7 @@
                         <h5 class="modal-title">
                             {{ $t("Add API Key") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <!-- Name -->
@@ -67,7 +67,7 @@
                         <h5 class="modal-title">
                             {{ $t("Key Added") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
 
                     <div class="modal-body">
diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index 7faa4c532..c4b0ec363 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -6,7 +6,7 @@
                     <h5 class="modal-title">
                         {{ $t("Badge Generator", [monitor.name]) }}
                     </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body">
                     <div class="mb-3">
diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
index e855b6769..10eae9d00 100644
--- a/src/components/Confirm.vue
+++ b/src/components/Confirm.vue
@@ -6,7 +6,7 @@
                     <h5 id="exampleModalLabel" class="modal-title">
                         {{ title || $t("Confirm") }}
                     </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body">
                     <slot />
diff --git a/src/components/CreateGroupDialog.vue b/src/components/CreateGroupDialog.vue
index 8bac1ccd0..8eed853c1 100644
--- a/src/components/CreateGroupDialog.vue
+++ b/src/components/CreateGroupDialog.vue
@@ -6,7 +6,7 @@
                     <h5 class="modal-title">
                         {{ $t("New Group") }}
                     </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body">
                     <form @submit.prevent="confirm">
diff --git a/src/components/DockerHostDialog.vue b/src/components/DockerHostDialog.vue
index d2cde8186..9c51ecdb4 100644
--- a/src/components/DockerHostDialog.vue
+++ b/src/components/DockerHostDialog.vue
@@ -7,7 +7,7 @@
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Docker Host") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue
index 8723c4862..74ddae1c8 100644
--- a/src/components/MonitorSettingDialog.vue
+++ b/src/components/MonitorSettingDialog.vue
@@ -6,7 +6,7 @@
                     <h5 class="modal-title">
                         {{ $t("Monitor Setting", [monitor.name]) }}
                     </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body">
                     <div class="my-3 form-check">
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 3c668c9ba..1d2902103 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -7,7 +7,7 @@
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Notification") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
diff --git a/src/components/ProxyDialog.vue b/src/components/ProxyDialog.vue
index aae635469..c17bc4fc3 100644
--- a/src/components/ProxyDialog.vue
+++ b/src/components/ProxyDialog.vue
@@ -7,7 +7,7 @@
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Proxy") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
diff --git a/src/components/RemoteBrowserDialog.vue b/src/components/RemoteBrowserDialog.vue
index 941ab8f7d..bc87ce691 100644
--- a/src/components/RemoteBrowserDialog.vue
+++ b/src/components/RemoteBrowserDialog.vue
@@ -7,7 +7,7 @@
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Add a Remote Browser") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
diff --git a/src/components/ScreenshotDialog.vue b/src/components/ScreenshotDialog.vue
index bc829095d..3adb4c92f 100644
--- a/src/components/ScreenshotDialog.vue
+++ b/src/components/ScreenshotDialog.vue
@@ -6,7 +6,7 @@
                     <h5 class="modal-title">
                         {{ $t("Browser Screenshot") }}
                     </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body"></div>
                 <img :src="imageURL" alt="screenshot of the website">
diff --git a/src/components/TagEditDialog.vue b/src/components/TagEditDialog.vue
index 77fce2609..6fcb62b39 100644
--- a/src/components/TagEditDialog.vue
+++ b/src/components/TagEditDialog.vue
@@ -7,7 +7,7 @@
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Edit Tag") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">
diff --git a/src/components/TwoFADialog.vue b/src/components/TwoFADialog.vue
index 6a0bf406a..44c64a57b 100644
--- a/src/components/TwoFADialog.vue
+++ b/src/components/TwoFADialog.vue
@@ -9,7 +9,7 @@
                             <span v-if="twoFAStatus == true" class="badge bg-primary">{{ $t("Active") }}</span>
                             <span v-if="twoFAStatus == false" class="badge bg-primary">{{ $t("Inactive") }}</span>
                         </h5>
-                        <button :disabled="processing" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button :disabled="processing" type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                     </div>
                     <div class="modal-body">
                         <div class="mb-3">

From 25930405770e66f300854952aa61f38eb166c8bf Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 20:54:29 +0100
Subject: [PATCH 02/18] allow translating "screenshot of the website"

---
 src/components/ScreenshotDialog.vue | 2 +-
 src/lang/en.json                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ScreenshotDialog.vue b/src/components/ScreenshotDialog.vue
index 3adb4c92f..25ce0042f 100644
--- a/src/components/ScreenshotDialog.vue
+++ b/src/components/ScreenshotDialog.vue
@@ -9,7 +9,7 @@
                     <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body"></div>
-                <img :src="imageURL" alt="screenshot of the website">
+                <img :src="imageURL" :alt="$t('screenshot of the website')">
             </div>
         </div>
     </div>
diff --git a/src/lang/en.json b/src/lang/en.json
index b6687bc3c..b2c18915b 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1245,6 +1245,7 @@
     "minimumIntervalWarning": "Intervals below 20 seconds may result in poor performance.",
     "lowIntervalWarning": "Are you sure want to set the interval value below 20 seconds? Performance may be degraded, particularly if there are a large number of monitors.",
     "imageResetConfirmation": "Image reset to default",
+    "screenshot of the website": "Screenshot of the website",
     "avgPing": "Avg Ping",
     "maxPing": "Max Ping",
     "minPing": "Min Ping"

From aa2563a5073a8d4f0d7ca76e057c14fd39f50ada Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 20:55:42 +0100
Subject: [PATCH 03/18] allow translating "Basic checkbox toggle button group"

---
 src/components/settings/Appearance.vue | 4 ++--
 src/lang/en.json                       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/Appearance.vue b/src/components/settings/Appearance.vue
index a1391d614..f80cd6677 100644
--- a/src/components/settings/Appearance.vue
+++ b/src/components/settings/Appearance.vue
@@ -20,7 +20,7 @@
                 <div
                     class="btn-group"
                     role="group"
-                    aria-label="Basic checkbox toggle button group"
+                    :aria-label="$t('Basic checkbox toggle button group')"
                 >
                     <input
                         id="btncheck1"
@@ -69,7 +69,7 @@
                 <div
                     class="btn-group"
                     role="group"
-                    aria-label="Basic checkbox toggle button group"
+                    :aria-label="$t('Basic checkbox toggle button group')"
                 >
                     <input
                         id="btncheck4"
diff --git a/src/lang/en.json b/src/lang/en.json
index b2c18915b..7324aead5 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1246,6 +1246,7 @@
     "lowIntervalWarning": "Are you sure want to set the interval value below 20 seconds? Performance may be degraded, particularly if there are a large number of monitors.",
     "imageResetConfirmation": "Image reset to default",
     "screenshot of the website": "Screenshot of the website",
+    "Basic checkbox toggle button group": "Basic checkbox toggle button group",
     "avgPing": "Avg Ping",
     "maxPing": "Max Ping",
     "minPing": "Min Ping"

From 8f1d54247be300a8b92c608908a9a1e3190e8d7d Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 20:58:24 +0100
Subject: [PATCH 04/18] allow translating "Basic radio toggle button group"

---
 src/lang/en.json            | 1 +
 src/pages/SetupDatabase.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 7324aead5..3783ae4d8 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1247,6 +1247,7 @@
     "imageResetConfirmation": "Image reset to default",
     "screenshot of the website": "Screenshot of the website",
     "Basic checkbox toggle button group": "Basic checkbox toggle button group",
+    "Basic radio toggle button group": "Basic radio toggle button group",
     "avgPing": "Avg Ping",
     "maxPing": "Max Ping",
     "minPing": "Min Ping"
diff --git a/src/pages/SetupDatabase.vue b/src/pages/SetupDatabase.vue
index 81738a98b..6b3983d1c 100644
--- a/src/pages/SetupDatabase.vue
+++ b/src/pages/SetupDatabase.vue
@@ -33,7 +33,7 @@
                     {{ $t("setupDatabaseChooseDatabase") }}
                 </p>
 
-                <div class="btn-group" role="group" aria-label="Basic radio toggle button group">
+                <div class="btn-group" role="group" :aria-label="$t('Basic radio toggle button group')">
                     <template v-if="info.isEnabledEmbeddedMariaDB">
                         <input id="btnradio3" v-model="dbConfig.type" type="radio" class="btn-check" autocomplete="off" value="embedded-mariadb">
 

From f4f8019202c5542be58951b392d0bcc01785e195 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 21:04:01 +0100
Subject: [PATCH 05/18] translate confirmation boxes

---
 src/components/Confirm.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
index 10eae9d00..3bb6da409 100644
--- a/src/components/Confirm.vue
+++ b/src/components/Confirm.vue
@@ -37,12 +37,16 @@ export default {
         /** Text to use as yes */
         yesText: {
             type: String,
-            default: "Yes",     // TODO: No idea what to translate this
+            default() {
+                return this.$t("Yes");
+            }
         },
         /** Text to use as no */
         noText: {
             type: String,
-            default: "No",
+            default() {
+                return this.$t("No");
+            }
         },
         /** Title to show on modal. Defaults to translated version of "Config" */
         title: {

From f230aecebd3975efe1e217a27f5cb8a45a898084 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 22:05:34 +0100
Subject: [PATCH 06/18] fix showing "30 day" instead of "30 days" and giving
 our translators the chance to differentiate between them

---
 src/components/Uptime.vue | 6 +++---
 src/lang/en.json          | 6 ++----
 src/pages/Details.vue     | 8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index 64bbd4e51..661030b72 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -85,12 +85,12 @@ export default {
 
         title() {
             if (this.type === "1y") {
-                return `1${this.$t("-year")}`;
+                return `1 ${this.$tc("year", 1)}`;
             }
             if (this.type === "720") {
-                return `30${this.$t("-day")}`;
+                return `30 ${this.$tc("day", 30)}`;
             }
-            return `24${this.$t("-hour")}`;
+            return `24 ${this.$tc("hour", 24)}`;
         }
     },
 };
diff --git a/src/lang/en.json b/src/lang/en.json
index 3783ae4d8..dfa8df22b 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -52,10 +52,8 @@
     "now": "now",
     "time ago": "{0} ago",
     "day": "day | days",
-    "-day": "-day",
-    "hour": "hour",
-    "-hour": "-hour",
-    "-year": "-year",
+    "hour": "hour | hours",
+    "year": "year | years",
     "Response": "Response",
     "Ping": "Ping",
     "Monitor Type": "Monitor Type",
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index a79ba76b4..e541e23b5 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -237,7 +237,7 @@
                     >
                         <h4 class="col-4 col-sm-12">{{ pingTitle(true) }}</h4>
                         <p class="col-4 col-sm-12 mb-0 mb-sm-2">
-                            (24{{ $t("-hour") }})
+                            ({{ 24 }} {{ $tc("hour", 24) }})
                         </p>
                         <span class="col-4 col-sm-12 num">
                             <CountUp :value="avgPing" />
@@ -250,7 +250,7 @@
                     >
                         <h4 class="col-4 col-sm-12">{{ $t("Uptime") }}</h4>
                         <p class="col-4 col-sm-12 mb-0 mb-sm-2">
-                            (24{{ $t("-hour") }})
+                            ({{ 24 }} {{ $tc("hour", 24) }})
                         </p>
                         <span class="col-4 col-sm-12 num">
                             <Uptime :monitor="monitor" type="24" />
@@ -263,7 +263,7 @@
                     >
                         <h4 class="col-4 col-sm-12">{{ $t("Uptime") }}</h4>
                         <p class="col-4 col-sm-12 mb-0 mb-sm-2">
-                            (30{{ $t("-day") }})
+                            ({{ 30 }} {{ $tc("day", 30) }})
                         </p>
                         <span class="col-4 col-sm-12 num">
                             <Uptime :monitor="monitor" type="720" />
@@ -276,7 +276,7 @@
                     >
                         <h4 class="col-4 col-sm-12">{{ $t("Uptime") }}</h4>
                         <p class="col-4 col-sm-12 mb-0 mb-sm-2">
-                            (1{{ $t("-year") }})
+                            ({{ 1 }} {{ $tc("year", 1) }})
                         </p>
                         <span class="col-4 col-sm-12 num">
                             <Uptime :monitor="monitor" type="1y" />

From 3c24420840ee8ffd33cf86a2aefd7b62a8c07f50 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 5 Jan 2026 22:29:03 +0100
Subject: [PATCH 07/18] fix deperecation

---
 src/components/Confirm.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
index 3bb6da409..fd135e0f0 100644
--- a/src/components/Confirm.vue
+++ b/src/components/Confirm.vue
@@ -13,10 +13,10 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn" :class="btnStyle" data-bs-dismiss="modal" @click="yes">
-                        {{ yesText }}
+                        {{ yesText || $t("Yes") }}
                     </button>
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="no">
-                        {{ noText }}
+                        {{ noText || $t("No") }}
                     </button>
                 </div>
             </div>
@@ -37,16 +37,12 @@ export default {
         /** Text to use as yes */
         yesText: {
             type: String,
-            default() {
-                return this.$t("Yes");
-            }
+            default: null,
         },
         /** Text to use as no */
         noText: {
             type: String,
-            default() {
-                return this.$t("No");
-            }
+            default: null,
         },
         /** Title to show on modal. Defaults to translated version of "Config" */
         title: {

From 79d22d13eb4d931bf704c84e2dcc4e1d61023ea0 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 01:48:40 +0100
Subject: [PATCH 08/18] try to make the armv7 test ore reproducibe

---
 .github/workflows/auto-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index e86d7dd00..a46bd8afc 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -86,8 +86,8 @@ jobs:
           docker run --rm --platform linux/arm/v7 \
             -v $PWD:/workspace \
             -w /workspace \
-            arm32v7/node:${{ matrix.node }}-slim \
-            bash -c "npm install --production"
+            arm32v7/node:${{ matrix.node }} \
+            bash -c "npm clean-install --production"
 
   check-linters:
     runs-on: ubuntu-latest

From 4af6bdac4c039cf67d856436b974c545eb034ca8 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 01:58:02 +0100
Subject: [PATCH 09/18] rollout the clean-install more

---
 .github/workflows/auto-test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index a46bd8afc..add2485e8 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -47,7 +47,7 @@ jobs:
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
       with:
         node-version: ${{ matrix.node }}
-    - run: npm install
+    - run: npm clean-install --no-fund
     
     - name: Rebuild native modules for ARM64
       if: matrix.os == 'ubuntu-22.04-arm'
@@ -87,7 +87,7 @@ jobs:
             -v $PWD:/workspace \
             -w /workspace \
             arm32v7/node:${{ matrix.node }} \
-            bash -c "npm clean-install --production"
+            npm clean-install --no-fund --production
 
   check-linters:
     runs-on: ubuntu-latest
@@ -110,7 +110,7 @@ jobs:
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
       with:
         node-version: 20
-    - run: npm install
+    - run: npm clean-install --no-fund
     - run: npm run lint:prod
 
   e2e-test:
@@ -135,7 +135,7 @@ jobs:
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
       with:
         node-version: 22
-    - run: npm install
+    - run: npm clean-install --no-fund
     
     - name: Rebuild native modules for ARM64
       run: npm rebuild @louislam/sqlite3

From bae34388b905c363b6ac2e27b255f82c0421ebf2 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 02:00:14 +0100
Subject: [PATCH 10/18] include the node version in the cache key for better
 reproducibility

---
 .github/workflows/auto-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index add2485e8..63011d8bb 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -41,7 +41,7 @@ jobs:
       id: node-modules-cache
       with:
         path: node_modules
-        key: node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+        key: node-modules-${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
 
     - name: Use Node.js ${{ matrix.node }}
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
@@ -104,7 +104,7 @@ jobs:
       id: node-modules-cache
       with:
         path: node_modules
-        key: node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+        key: node-modules-${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
 
     - name: Use Node.js 20
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
@@ -129,7 +129,7 @@ jobs:
       id: node-modules-cache
       with:
         path: node_modules
-        key: node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+        key: node-modules-${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
 
     - name: Setup Node.js
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0

From 7f4a527b03d9a66e5a0dce724e0c3a7fdfade97d Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 02:01:27 +0100
Subject: [PATCH 11/18] don't fail-fast

---
 .github/workflows/auto-test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index 63011d8bb..9063c2e16 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -22,6 +22,7 @@ jobs:
       contents: read
 
     strategy:
+      fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest, ubuntu-22.04-arm]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
@@ -65,6 +66,7 @@ jobs:
     permissions:
       contents: read
     strategy:
+      fail-fast: false
       matrix:
         node: [ 20, 22 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/

From cf1391db6bd3b94a6d39426e92507d424c7004de Mon Sep 17 00:00:00 2001
From: mkdev11 <jaysmth689@gmail.com>
Date: Tue, 6 Jan 2026 03:08:10 +0200
Subject: [PATCH 12/18] feat: add conditions support for MQTT monitor type

Add rich conditions support to MQTT monitor similar to DNS monitor,
allowing users to define flexible conditions on:
- topic: The MQTT topic that received the message
- message: The raw message content
- json_value: JSONata-extracted value from JSON payloads

This provides a more intuitive and powerful way to validate MQTT
messages compared to the basic keyword/json-query checks.

Maintains backward compatibility with existing keyword and json-query
check types.

Closes #5992
---
 server/monitor-types/mqtt.js | 64 +++++++++++++++++++++++++++++++-----
 src/lang/en.json             |  2 ++
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index 18595b3a4..acc76e853 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -2,10 +2,22 @@ const { MonitorType } = require("./monitor-type");
 const { log, UP } = require("../../src/util");
 const mqtt = require("mqtt");
 const jsonata = require("jsonata");
+const { ConditionVariable } = require("../monitor-conditions/variables");
+const { defaultStringOperators, defaultNumberOperators } = require("../monitor-conditions/operators");
+const { ConditionExpressionGroup } = require("../monitor-conditions/expression");
+const { evaluateExpressionGroup } = require("../monitor-conditions/evaluator");
 
 class MqttMonitorType extends MonitorType {
     name = "mqtt";
 
+    supportsConditions = true;
+
+    conditionVariables = [
+        new ConditionVariable("topic", defaultStringOperators),
+        new ConditionVariable("message", defaultStringOperators),
+        new ConditionVariable("json_value", defaultStringOperators.concat(defaultNumberOperators)),
+    ];
+
     /**
      * @inheritdoc
      */
@@ -23,7 +35,46 @@ class MqttMonitorType extends MonitorType {
             monitor.mqttCheckType = "keyword";
         }
 
-        if (monitor.mqttCheckType === "keyword") {
+        // Prepare conditions evaluation
+        const conditions = ConditionExpressionGroup.fromMonitor(monitor);
+        const hasConditions = conditions && conditions.children && conditions.children.length > 0;
+
+        // Parse JSON if needed for conditions
+        let parsedMessage = null;
+        let jsonValue = null;
+        if (hasConditions || monitor.mqttCheckType === "json-query") {
+            try {
+                parsedMessage = JSON.parse(receivedMessage);
+                if (monitor.jsonPath) {
+                    let expression = jsonata(monitor.jsonPath);
+                    jsonValue = await expression.evaluate(parsedMessage);
+                }
+            } catch (e) {
+                // Not valid JSON, that's okay for keyword check
+                if (monitor.mqttCheckType === "json-query") {
+                    throw new Error("Invalid JSON in MQTT message: " + e.message);
+                }
+            }
+        }
+
+        // If conditions are defined, use them
+        if (hasConditions) {
+            const conditionData = {
+                topic: messageTopic,
+                message: receivedMessage,
+                json_value: jsonValue?.toString() ?? "",
+            };
+
+            const conditionsResult = evaluateExpressionGroup(conditions, conditionData);
+
+            if (conditionsResult) {
+                heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
+                heartbeat.status = UP;
+            } else {
+                throw new Error(`Conditions not met - Topic: ${messageTopic}; Message: ${receivedMessage}`);
+            }
+        } else if (monitor.mqttCheckType === "keyword") {
+            // Legacy keyword check
             if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
                 heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
                 heartbeat.status = UP;
@@ -31,17 +82,12 @@ class MqttMonitorType extends MonitorType {
                 throw Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
             }
         } else if (monitor.mqttCheckType === "json-query") {
-            const parsedMessage = JSON.parse(receivedMessage);
-
-            let expression = jsonata(monitor.jsonPath);
-
-            let result = await expression.evaluate(parsedMessage);
-
-            if (result?.toString() === monitor.expectedValue) {
+            // Legacy json-query check
+            if (jsonValue?.toString() === monitor.expectedValue) {
                 heartbeat.msg = "Message received, expected value is found";
                 heartbeat.status = UP;
             } else {
-                throw new Error("Message received but value is not equal to expected value, value was: [" + result + "]");
+                throw new Error("Message received but value is not equal to expected value, value was: [" + jsonValue + "]");
             }
         } else {
             throw Error("Unknown MQTT Check Type");
diff --git a/src/lang/en.json b/src/lang/en.json
index 3f7bde3aa..5a8600218 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -1121,6 +1121,8 @@
     "less than or equal to": "less than or equal to",
     "greater than or equal to": "greater than or equal to",
     "record": "record",
+    "message": "message",
+    "json_value": "JSON value",
     "Notification Channel": "Notification Channel",
     "Sound": "Sound",
     "Alphanumerical string and hyphens only": "Alphanumerical string and hyphens only",

From e22784aaea49d0ed7cc3a589aa5927567183a517 Mon Sep 17 00:00:00 2001
From: mkdev11 <jaysmth689@gmail.com>
Date: Tue, 6 Jan 2026 03:19:22 +0200
Subject: [PATCH 13/18] fix: guard against undefined conditions in MQTT monitor

Add check for monitor.conditions before calling fromMonitor() to
prevent JSON.parse(undefined) error when monitors don't have
conditions defined.
---
 server/monitor-types/mqtt.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index acc76e853..dd3863a89 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -35,8 +35,8 @@ class MqttMonitorType extends MonitorType {
             monitor.mqttCheckType = "keyword";
         }
 
-        // Prepare conditions evaluation
-        const conditions = ConditionExpressionGroup.fromMonitor(monitor);
+        // Prepare conditions evaluation (only if monitor has conditions defined)
+        const conditions = monitor.conditions ? ConditionExpressionGroup.fromMonitor(monitor) : null;
         const hasConditions = conditions && conditions.children && conditions.children.length > 0;
 
         // Parse JSON if needed for conditions

From 8b145d2522e873934a9f212168cc739ca59462ca Mon Sep 17 00:00:00 2001
From: mkdev11 <jaysmth689@gmail.com>
Date: Tue, 6 Jan 2026 03:48:31 +0200
Subject: [PATCH 14/18] refactor: split MQTT check() into smaller functions

Per CommanderStorm's feedback, refactor the check() method into:
- checkKeyword() - for legacy keyword matching
- checkJsonQuery() - for legacy JSONata query
- checkConditions() - for new conditions system

Also add test cases for MQTT conditions:
- Message condition with contains operator
- Topic condition with equals operator
- Condition mismatch rejection
- Multiple conditions with AND logic

This improves readability and maintainability.
---
 server/monitor-types/mqtt.js            | 122 +++++++++++++++---------
 test/backend-test/monitors/test-mqtt.js |  62 +++++++++++-
 2 files changed, 138 insertions(+), 46 deletions(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index dd3863a89..f1c1ad23c 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -31,66 +31,98 @@ class MqttMonitorType extends MonitorType {
         });
 
         if (monitor.mqttCheckType == null || monitor.mqttCheckType === "") {
-            // use old default
             monitor.mqttCheckType = "keyword";
         }
 
-        // Prepare conditions evaluation (only if monitor has conditions defined)
+        // Check if conditions are defined
         const conditions = monitor.conditions ? ConditionExpressionGroup.fromMonitor(monitor) : null;
         const hasConditions = conditions && conditions.children && conditions.children.length > 0;
 
-        // Parse JSON if needed for conditions
-        let parsedMessage = null;
+        if (hasConditions) {
+            await this.checkConditions(monitor, heartbeat, messageTopic, receivedMessage, conditions);
+        } else if (monitor.mqttCheckType === "keyword") {
+            this.checkKeyword(monitor, heartbeat, messageTopic, receivedMessage);
+        } else if (monitor.mqttCheckType === "json-query") {
+            await this.checkJsonQuery(monitor, heartbeat, receivedMessage);
+        } else {
+            throw new Error("Unknown MQTT Check Type");
+        }
+    }
+
+    /**
+     * Check using keyword matching
+     * @param {object} monitor Monitor object
+     * @param {object} heartbeat Heartbeat object
+     * @param {string} messageTopic Received MQTT topic
+     * @param {string} receivedMessage Received MQTT message
+     * @returns {void}
+     * @throws {Error} If keyword is not found in message
+     */
+    checkKeyword(monitor, heartbeat, messageTopic, receivedMessage) {
+        if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
+            heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
+            heartbeat.status = UP;
+        } else {
+            throw new Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
+        }
+    }
+
+    /**
+     * Check using JSONata query
+     * @param {object} monitor Monitor object
+     * @param {object} heartbeat Heartbeat object
+     * @param {string} receivedMessage Received MQTT message
+     * @returns {Promise<void>}
+     */
+    async checkJsonQuery(monitor, heartbeat, receivedMessage) {
+        const parsedMessage = JSON.parse(receivedMessage);
+        const expression = jsonata(monitor.jsonPath);
+        const result = await expression.evaluate(parsedMessage);
+
+        if (result?.toString() === monitor.expectedValue) {
+            heartbeat.msg = "Message received, expected value is found";
+            heartbeat.status = UP;
+        } else {
+            throw new Error("Message received but value is not equal to expected value, value was: [" + result + "]");
+        }
+    }
+
+    /**
+     * Check using conditions system
+     * @param {object} monitor Monitor object
+     * @param {object} heartbeat Heartbeat object
+     * @param {string} messageTopic Received MQTT topic
+     * @param {string} receivedMessage Received MQTT message
+     * @param {ConditionExpressionGroup} conditions Parsed conditions
+     * @returns {Promise<void>}
+     */
+    async checkConditions(monitor, heartbeat, messageTopic, receivedMessage, conditions) {
         let jsonValue = null;
-        if (hasConditions || monitor.mqttCheckType === "json-query") {
+
+        // Parse JSON and extract value if jsonPath is defined
+        if (monitor.jsonPath) {
             try {
-                parsedMessage = JSON.parse(receivedMessage);
-                if (monitor.jsonPath) {
-                    let expression = jsonata(monitor.jsonPath);
-                    jsonValue = await expression.evaluate(parsedMessage);
-                }
+                const parsedMessage = JSON.parse(receivedMessage);
+                const expression = jsonata(monitor.jsonPath);
+                jsonValue = await expression.evaluate(parsedMessage);
             } catch (e) {
-                // Not valid JSON, that's okay for keyword check
-                if (monitor.mqttCheckType === "json-query") {
-                    throw new Error("Invalid JSON in MQTT message: " + e.message);
-                }
+                // JSON parsing failed, jsonValue remains null
             }
         }
 
-        // If conditions are defined, use them
-        if (hasConditions) {
-            const conditionData = {
-                topic: messageTopic,
-                message: receivedMessage,
-                json_value: jsonValue?.toString() ?? "",
-            };
+        const conditionData = {
+            topic: messageTopic,
+            message: receivedMessage,
+            json_value: jsonValue?.toString() ?? "",
+        };
 
-            const conditionsResult = evaluateExpressionGroup(conditions, conditionData);
+        const conditionsResult = evaluateExpressionGroup(conditions, conditionData);
 
-            if (conditionsResult) {
-                heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
-                heartbeat.status = UP;
-            } else {
-                throw new Error(`Conditions not met - Topic: ${messageTopic}; Message: ${receivedMessage}`);
-            }
-        } else if (monitor.mqttCheckType === "keyword") {
-            // Legacy keyword check
-            if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
-                heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
-                heartbeat.status = UP;
-            } else {
-                throw Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
-            }
-        } else if (monitor.mqttCheckType === "json-query") {
-            // Legacy json-query check
-            if (jsonValue?.toString() === monitor.expectedValue) {
-                heartbeat.msg = "Message received, expected value is found";
-                heartbeat.status = UP;
-            } else {
-                throw new Error("Message received but value is not equal to expected value, value was: [" + jsonValue + "]");
-            }
+        if (conditionsResult) {
+            heartbeat.msg = `Topic: ${messageTopic}; Message: ${receivedMessage}`;
+            heartbeat.status = UP;
         } else {
-            throw Error("Unknown MQTT Check Type");
+            throw new Error(`Conditions not met - Topic: ${messageTopic}; Message: ${receivedMessage}`);
         }
     }
 
diff --git a/test/backend-test/monitors/test-mqtt.js b/test/backend-test/monitors/test-mqtt.js
index a361e868e..75d8e1d95 100644
--- a/test/backend-test/monitors/test-mqtt.js
+++ b/test/backend-test/monitors/test-mqtt.js
@@ -12,9 +12,10 @@ const { UP, PENDING } = require("../../../src/util");
  * @param {string} receivedMessage what message is received from the mqtt channel
  * @param {string} monitorTopic which MQTT topic is monitored (wildcards are allowed)
  * @param {string} publishTopic to which MQTT topic the message is sent
+ * @param {string|null} conditions JSON string of conditions or null
  * @returns {Promise<Heartbeat>} the heartbeat produced by the check
  */
-async function testMqtt(mqttSuccessMessage, mqttCheckType, receivedMessage, monitorTopic = "test", publishTopic = "test") {
+async function testMqtt(mqttSuccessMessage, mqttCheckType, receivedMessage, monitorTopic = "test", publishTopic = "test", conditions = null) {
     const hiveMQContainer = await new HiveMQContainer().start();
     const connectionString = hiveMQContainer.getConnectionString();
     const mqttMonitorType = new MqttMonitorType();
@@ -30,6 +31,7 @@ async function testMqtt(mqttSuccessMessage, mqttCheckType, receivedMessage, moni
         mqttSuccessMessage: mqttSuccessMessage, // for keywords
         expectedValue: mqttSuccessMessage, // for json-query
         mqttCheckType: mqttCheckType,
+        conditions: conditions, // for conditions system
     };
     const heartbeat = {
         msg: "",
@@ -157,4 +159,62 @@ describe("MqttMonitorType", {
             new Error("Message received but value is not equal to expected value, value was: [present]")
         );
     });
+
+    // Conditions system tests
+    test("check() sets status to UP when message condition matches (contains)", async () => {
+        const conditions = JSON.stringify([
+            {
+                variable: "message",
+                operator: "contains",
+                value: "KEYWORD"
+            }
+        ]);
+        const heartbeat = await testMqtt("", null, "-> KEYWORD <-", "test", "test", conditions);
+        assert.strictEqual(heartbeat.status, UP);
+        assert.strictEqual(heartbeat.msg, "Topic: test; Message: -> KEYWORD <-");
+    });
+
+    test("check() sets status to UP when topic condition matches (equals)", async () => {
+        const conditions = JSON.stringify([
+            {
+                variable: "topic",
+                operator: "equals",
+                value: "sensors/temp"
+            }
+        ]);
+        const heartbeat = await testMqtt("", null, "any message", "sensors/temp", "sensors/temp", conditions);
+        assert.strictEqual(heartbeat.status, UP);
+    });
+
+    test("check() rejects when message condition does not match", async () => {
+        const conditions = JSON.stringify([
+            {
+                variable: "message",
+                operator: "contains",
+                value: "EXPECTED"
+            }
+        ]);
+        await assert.rejects(
+            testMqtt("", null, "actual message without keyword", "test", "test", conditions),
+            new Error("Conditions not met - Topic: test; Message: actual message without keyword")
+        );
+    });
+
+    test("check() sets status to UP with multiple conditions (AND)", async () => {
+        const conditions = JSON.stringify([
+            {
+                variable: "topic",
+                operator: "equals",
+                value: "test"
+            },
+            {
+                variable: "message",
+                operator: "contains",
+                value: "success",
+                andOr: "and"
+            }
+        ]);
+        const heartbeat = await testMqtt("", null, "operation success", "test", "test", conditions);
+        assert.strictEqual(heartbeat.status, UP);
+    });
 });

From 11f451d7f2bec2929f07a548e1df494c24a2615d Mon Sep 17 00:00:00 2001
From: mkdev11 <jaysmth689@gmail.com>
Date: Tue, 6 Jan 2026 03:57:34 +0200
Subject: [PATCH 15/18] fix: add type field to condition test objects

The processMonitorConditions function expects conditions with
type: 'expression' field. Fixed test cases to use correct format.
---
 test/backend-test/monitors/test-mqtt.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/backend-test/monitors/test-mqtt.js b/test/backend-test/monitors/test-mqtt.js
index 75d8e1d95..d9b53a8c5 100644
--- a/test/backend-test/monitors/test-mqtt.js
+++ b/test/backend-test/monitors/test-mqtt.js
@@ -164,6 +164,7 @@ describe("MqttMonitorType", {
     test("check() sets status to UP when message condition matches (contains)", async () => {
         const conditions = JSON.stringify([
             {
+                type: "expression",
                 variable: "message",
                 operator: "contains",
                 value: "KEYWORD"
@@ -177,6 +178,7 @@ describe("MqttMonitorType", {
     test("check() sets status to UP when topic condition matches (equals)", async () => {
         const conditions = JSON.stringify([
             {
+                type: "expression",
                 variable: "topic",
                 operator: "equals",
                 value: "sensors/temp"
@@ -189,6 +191,7 @@ describe("MqttMonitorType", {
     test("check() rejects when message condition does not match", async () => {
         const conditions = JSON.stringify([
             {
+                type: "expression",
                 variable: "message",
                 operator: "contains",
                 value: "EXPECTED"
@@ -203,11 +206,13 @@ describe("MqttMonitorType", {
     test("check() sets status to UP with multiple conditions (AND)", async () => {
         const conditions = JSON.stringify([
             {
+                type: "expression",
                 variable: "topic",
                 operator: "equals",
                 value: "test"
             },
             {
+                type: "expression",
                 variable: "message",
                 operator: "contains",
                 value: "success",

From bce9eca6e358517ce86cf13d5bab118ac553ca22 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 05:46:55 +0100
Subject: [PATCH 16/18] wait a bit for analytics in CI

---
 test/e2e/specs/status-page.spec.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/e2e/specs/status-page.spec.js b/test/e2e/specs/status-page.spec.js
index 809cfdbe4..360fa464a 100644
--- a/test/e2e/specs/status-page.spec.js
+++ b/test/e2e/specs/status-page.spec.js
@@ -178,6 +178,9 @@ test.describe("Status Page", () => {
         await page.getByTestId("analytics-id-input").fill(plausibleAnalyticsDomainsUrls);
         await page.getByTestId("save-button").click();
         await screenshot(testInfo, page);
+        await page.waitForFunction((scriptUrl) => {
+            return document.head.innerHTML.includes(scriptUrl);
+        }, plausibleAnalyticsScriptUrl, { timeout: 5000 });
         expect(await page.locator("head").innerHTML()).toContain(plausibleAnalyticsScriptUrl);
         expect(await page.locator("head").innerHTML()).toContain(plausibleAnalyticsDomainsUrls);
 
@@ -188,6 +191,9 @@ test.describe("Status Page", () => {
         await page.getByTestId("analytics-id-input").fill(matomoSiteId);
         await page.getByTestId("save-button").click();
         await screenshot(testInfo, page);
+        await page.waitForFunction((url) => {
+            return document.head.innerHTML.includes(url);
+        }, matomoUrl, { timeout: 5000 });
         expect(await page.locator("head").innerHTML()).toContain(matomoUrl);
         expect(await page.locator("head").innerHTML()).toContain(matomoSiteId);
     });

From 95bfae5c8dddc74c68f2d2f7e575baf4b5d18056 Mon Sep 17 00:00:00 2001
From: leonace924 <meobius123@gmail.com>
Date: Mon, 5 Jan 2026 23:51:50 -0500
Subject: [PATCH 17/18] fix: rename Badge Generator to Badge Link Generator and
 add helptext

---
 src/components/BadgeGeneratorDialog.vue | 7 ++++++-
 src/components/MonitorSettingDialog.vue | 2 +-
 src/lang/en.json                        | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeGeneratorDialog.vue
index c4b0ec363..5d576bc0f 100644
--- a/src/components/BadgeGeneratorDialog.vue
+++ b/src/components/BadgeGeneratorDialog.vue
@@ -4,11 +4,16 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">
-                        {{ $t("Badge Generator", [monitor.name]) }}
+                        {{ $t("Badge Link Generator", [monitor.name]) }}
                     </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$t('Close')" />
                 </div>
                 <div class="modal-body">
+                    <i18n-t keypath="Badge Link Generator Helptext" tag="p" class="form-text mb-3">
+                        <template #documentation>
+                            <a href="https://github.com/louislam/uptime-kuma/wiki/Badge" target="_blank" rel="noopener noreferrer">{{ $t("documentation") }}</a>
+                        </template>
+                    </i18n-t>
                     <div class="mb-3">
                         <label for="type" class="form-label">{{ $t("Badge Type") }}</label>
                         <select id="type" v-model="badge.type" class="form-select">
diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue
index 74ddae1c8..155c1a7f8 100644
--- a/src/components/MonitorSettingDialog.vue
+++ b/src/components/MonitorSettingDialog.vue
@@ -34,7 +34,7 @@
                         @click="$refs.badgeGeneratorDialog.show(monitor.id, monitor.name)"
                     >
                         <font-awesome-icon icon="certificate" />
-                        {{ $t("Open Badge Generator") }}
+                        {{ $t("Open Badge Link Generator") }}
                     </button>
                 </div>
 
diff --git a/src/lang/en.json b/src/lang/en.json
index 3ae72c746..5bc546dd7 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -909,8 +909,9 @@
     "Monitor Setting": "{0}'s Monitor Setting",
     "Show Clickable Link": "Show Clickable Link",
     "Show Clickable Link Description": "If checked everyone who have access to this status page can have access to monitor URL.",
-    "Open Badge Generator": "Open Badge Generator",
-    "Badge Generator": "{0}'s Badge Generator",
+    "Open Badge Link Generator": "Open Badge Link Generator",
+    "Badge Link Generator": "{0}'s Badge Link Generator",
+    "Badge Link Generator Helptext": "Badge links are available for all monitors assigned to public status pages. For more information, please see the {documentation}.",
     "Badge Type": "Badge Type",
     "Badge Duration (in hours)": "Badge Duration (in hours)",
     "Badge Label": "Badge Label",

From 34ad04ee0c22a0cc1d025954c1b7cbadbfe5ff79 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 6 Jan 2026 05:57:36 +0100
Subject: [PATCH 18/18] rename the file as well

---
 ...geGeneratorDialog.vue => BadgeLinkGeneratorDialog.vue} | 0
 src/components/MonitorSettingDialog.vue                   | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/components/{BadgeGeneratorDialog.vue => BadgeLinkGeneratorDialog.vue} (100%)

diff --git a/src/components/BadgeGeneratorDialog.vue b/src/components/BadgeLinkGeneratorDialog.vue
similarity index 100%
rename from src/components/BadgeGeneratorDialog.vue
rename to src/components/BadgeLinkGeneratorDialog.vue
diff --git a/src/components/MonitorSettingDialog.vue b/src/components/MonitorSettingDialog.vue
index 155c1a7f8..88ba3ec4f 100644
--- a/src/components/MonitorSettingDialog.vue
+++ b/src/components/MonitorSettingDialog.vue
@@ -31,7 +31,7 @@
 
                     <button
                         class="btn btn-primary btn-add-group me-2"
-                        @click="$refs.badgeGeneratorDialog.show(monitor.id, monitor.name)"
+                        @click="$refs.badgeLinkGeneratorDialog.show(monitor.id, monitor.name)"
                     >
                         <font-awesome-icon icon="certificate" />
                         {{ $t("Open Badge Link Generator") }}
@@ -46,16 +46,16 @@
             </div>
         </div>
     </div>
-    <BadgeGeneratorDialog ref="badgeGeneratorDialog" />
+    <BadgeLinkGeneratorDialog ref="badgeLinkGeneratorDialog" />
 </template>
 
 <script lang="ts">
 import { Modal } from "bootstrap";
-import BadgeGeneratorDialog from "./BadgeGeneratorDialog.vue";
+import BadgeLinkGeneratorDialog from "./BadgeLinkGeneratorDialog.vue";
 
 export default {
     components: {
-        BadgeGeneratorDialog
+        BadgeLinkGeneratorDialog
     },
     props: {},
     emits: [],