diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c617f99a9..5aac1e29d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,36 +1,31 @@ -โ„น๏ธ To keep reviews fast and effective, please make sure youโ€™ve [read our pull request guidelines](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma) +# Summary -## ๐Ÿ“ Summary of changes done and why they are done +In this pull request, the following changes are made: - - -## ๐Ÿ“‹ Related issues +- Foobar was changed to FooFoo, because ... - Relates to #issue-number - Resolves #issue-number -## ๐Ÿ“„ Checklist -
Please follow this checklist to avoid unnecessary back and forth (click to expand) - [ ] โš ๏ธ If there are Breaking change (a fix or feature that alters existing functionality in a way that could cause issues) I have called them out - [ ] ๐Ÿง  I have disclosed any use of LLMs/AI in this contribution and reviewed all generated content. I understand that I am responsible for and able to explain every line of code I submit. -- [ ] ๐Ÿ” My code adheres to the style guidelines of this project. -- [ ] โš ๏ธ My changes generate no new warnings. -- [ ] ๐Ÿ› ๏ธ I have reviewed and tested my code. +- [ ] ๐Ÿ” Any UI changes adhere to visual style of this project. +- [ ] ๐Ÿ› ๏ธ I have self-reviewed and self-tested my code to ensure it works as expected. - [ ] ๐Ÿ“ I have commented my code, especially in hard-to-understand areas (e.g., using JSDoc for methods). - [ ] ๐Ÿค– I added or updated automated tests where appropriate. - [ ] ๐Ÿ“„ Documentation updates are included (if applicable). -- [ ] ๐Ÿ”’ I have considered potential security impacts and mitigated risks. - [ ] ๐Ÿงฐ Dependency updates are listed and explained. +- [ ] โš ๏ธ CI passes and is green.
-## ๐Ÿ“ท Screenshots or Visual Changes +## Screenshots for Visual Changes -
- - - - - - - {{ $t("selectedMonitorCount", [selectedMonitorCount]) }} +
+ +
+ + {{ $t("selectedMonitorCountMsg", selectedMonitorCount) }}
{{ $t("pauseMonitorMsg") }} + + + {{ $t("deleteMonitorsMsg") }} + diff --git a/src/components/notifications/Discord.vue b/src/components/notifications/Discord.vue index b65eb706a..6eff2a887 100644 --- a/src/components/notifications/Discord.vue +++ b/src/components/notifications/Discord.vue @@ -102,6 +102,24 @@
+ +
+
+ + +
+
+ {{ $t("discordSuppressNotificationsHelptext") }} +
+
diff --git a/src/components/notifications/Octopush.vue b/src/components/notifications/Octopush.vue index caf6f09d4..ffcbda104 100644 --- a/src/components/notifications/Octopush.vue +++ b/src/components/notifications/Octopush.vue @@ -2,8 +2,8 @@
{{ $t("octopushLegacyHint") }} diff --git a/src/components/settings/APIKeys.vue b/src/components/settings/APIKeys.vue index d57bc2371..68484cce6 100644 --- a/src/components/settings/APIKeys.vue +++ b/src/components/settings/APIKeys.vue @@ -27,7 +27,7 @@
{{ $t("apiKey-" + item.status) }}
-
{{ $t("Created") }}: {{ item.createdDate }}
+
{{ $t("createdAt", { date: item.createdDate }) }}
{{ $t("Expires") }}: {{ item.expires || $t("Never") }} diff --git a/src/components/settings/About.vue b/src/components/settings/About.vue index 012f60ecb..0ae4b22fd 100644 --- a/src/components/settings/About.vue +++ b/src/components/settings/About.vue @@ -3,8 +3,8 @@