7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-10 21:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hevans/add-heii-on-call-notification-provider

Browse Source
This commit is contained in:
Frank Elsinga
2024-03-05 19:20:14 +01:00
committed by GitHub
parent daa59b812c da92400401
commit e2239bc7b7
15 changed files with 1607 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/notifications/Line.vue
View File

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

1
src/i18n.js
View File

@@ -44,6 +44,7 @@ const languageList = {
"ur": "Urdu",
"ge": "ქართული",
"uz": "O'zbek tili",
"ga": "Gaeilge",
};
let messages = {

2
src/lang/en.json
View File

@@ -532,10 +532,12 @@
"Recipients": "Recipients",
"Access Token": "Access Token",
"Channel access token": "Channel access token",
"Channel access token (Long-lived)": "Channel access token (Long-lived)",
"Line Developers Console": "Line Developers Console",
"lineDevConsoleTo": "Line Developers Console - {0}",
"Basic Settings": "Basic Settings",
"User ID": "User ID",
"Your User ID": "Your user ID",
"Messaging API": "Messaging API",
"wayToGetLineChannelToken": "First access the {0}, create a provider and channel (Messaging API), then you can get the channel access token and user ID from the above mentioned menu items.",
"Icon URL": "Icon URL",

5
src/pages/Details.vue
View File

@@ -390,10 +390,7 @@ export default {
},
group() {
if (!this.monitor.pathName.includes("/")) {
return "";
}
return this.monitor.pathName.substr(0, this.monitor.pathName.lastIndexOf("/"));
return this.monitor.path.slice(0, -1).join(" / ");
},
pushURL() {

1
src/pages/EditMonitor.vue
View File

@@ -1395,6 +1395,7 @@ message HealthCheckResponse {
// group monitor fields
this.monitor.childrenIDs = undefined;
this.monitor.forceInactive = undefined;
this.monitor.path = undefined;
this.monitor.pathName = undefined;
this.monitor.screenshot = undefined;

15
src/util-frontend.js
View File

@@ -1,5 +1,5 @@
import dayjs from "dayjs";
import timezones from "timezones-list";
import { getTimeZones } from "@vvo/tzdb";
import { localeDirection, currentLocale } from "./i18n";
import { POSITION } from "vue-toastification";
@@ -29,18 +29,19 @@ function getTimezoneOffset(timeZone) {
*/
export function timezoneList() {
let result = [];
const timeZones = getTimeZones();
for (let timezone of timezones) {
for (let timezone of timeZones) {
try {
let display = dayjs().tz(timezone.tzCode).format("Z");
let display = dayjs().tz(timezone.name).format("Z");
result.push({
name: `(UTC${display}) ${timezone.tzCode}`,
value: timezone.tzCode,
time: getTimezoneOffset(timezone.tzCode),
name: `(UTC${display}) ${timezone.name}`,
value: timezone.name,
time: getTimezoneOffset(timezone.name),
});
} catch (e) {
// Skipping not supported timezone.tzCode by dayjs
// Skipping not supported timezone.name by dayjs
}
}