Merge branch 'louislam:master' into master

This commit is contained in:
Phuong Nguyen Minh 2022-01-27 08:30:45 +07:00 committed by GitHub
commit 02a8293d9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 409 additions and 1942 deletions

2198
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -89,8 +89,8 @@
"prometheus-api-metrics": "~3.2.0",
"qrcode": "~1.5.0",
"redbean-node": "0.1.3",
"socket.io": "~4.2.0",
"socket.io-client": "~4.2.0",
"socket.io": "~4.4.1",
"socket.io-client": "~4.4.1",
"tar": "^6.1.11",
"tcp-ping": "~0.1.1",
"thirty-two": "~1.0.2",
@ -126,8 +126,8 @@
"jest-puppeteer": "~6.0.0",
"puppeteer": "~10.4.0",
"sass": "~1.42.1",
"stylelint": "~13.13.1",
"stylelint-config-standard": "~22.0.0",
"stylelint": "~14.2.0",
"stylelint-config-standard": "~24.0.0",
"typescript": "~4.4.4",
"vite": "~2.6.14"
}

View file

@ -60,7 +60,9 @@ class Prometheus {
}
try {
monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining);
if (tlsInfo.certInfo != null) {
monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining);
}
} catch (e) {
console.error(e);
}

View file

@ -1,4 +1,15 @@
console.log("Welcome to Uptime Kuma");
// Check Node.js Version
const nodeVersion = parseInt(process.versions.node.split(".")[0]);
const requiredVersion = 14;
console.log(`Your Node.js version: ${nodeVersion}`);
if (nodeVersion < requiredVersion) {
console.error(`Error: Your Node.js version is not supported, please upgrade to Node.js >= ${requiredVersion}.`);
process.exit(-1);
}
const args = require("args-parser")(process.argv);
const { sleep, debug, getRandomInt, genSecret } = require("../src/util");
const config = require("./config");

View file

@ -16,8 +16,8 @@
<div v-if="tokenRequired">
<div class="form-floating mt-3">
<input id="floatingToken" v-model="token" type="text" maxlength="6" class="form-control" placeholder="123456">
<label for="floatingToken">{{ $t("Token") }}</label>
<input id="otp" v-model="token" type="text" maxlength="6" class="form-control" placeholder="123456">
<label for="otp">{{ $t("Token") }}</label>
</div>
</div>

View file

@ -237,7 +237,7 @@ export default {
promosms: "PromoSMS",
lunasea: "LunaSea",
apprise: "Apprise (obsługuje 50+ usług powiadomień)",
GoogleChat: "Google Chat (Wyłącznie Google Workspace)",
GoogleChat: "Google Chat (wyłącznie Google Workspace)",
pushbullet: "Pushbullet",
line: "Line Messenger",
mattermost: "Mattermost",
@ -310,12 +310,12 @@ export default {
Info: "Info",
Security: "Bezpieczeństwo",
"Steam API Key": "Klucz Steam API",
"Shrink Database": "Zmniejsz Bazę Danych",
"Pick a RR-Type...": "Wybierz Typ RR...",
"Pick Accepted Status Codes...": "Pick Accepted Status Codes...",
Default: "Default",
"Shrink Database": "Zmniejsz bazę danych",
"Pick a RR-Type...": "Wybierz typ RR...",
"Pick Accepted Status Codes...": "Wybierz akceptowalne kody statusu...",
Default: "Domyślnie",
"HTTP Options": "Opcje HTTP",
"Create Incident": "Stwórz Incydent",
"Create Incident": "Stwórz incydent",
Title: "Tytuł",
Content: "Treść",
Style: "Styl",
@ -328,22 +328,22 @@ export default {
Post: "Wyślij",
"Please input title and content": "Podaj tytuł i treść",
Created: "Stworzony",
"Last Updated": "Ostatnio Zaktualizowany",
"Last Updated": "Ostatnio zaktualizowany",
Unpin: "Odepnij",
"Switch to Light Theme": "Przełącz na Jasny Motyw",
"Switch to Dark Theme": "Przełącz na Ciemny Motyw",
"Show Tags": "Pokaż Tagi",
"Hide Tags": "Ukryj Tagi",
"Switch to Light Theme": "Przełącz na jasny motyw",
"Switch to Dark Theme": "Przełącz na ciemny motyw",
"Show Tags": "Pokaż tagi",
"Hide Tags": "Ukryj tagi",
Description: "Opis",
"No monitors available.": "Brak dostępnych monitorów.",
"Add one": "Dodaj jeden",
"No Monitors": "Brak Monitorów",
"No Monitors": "Brak monitorów",
"Untitled Group": "Nienazwana grupa",
Services: "Usługi",
Discard: "Odrzuć",
Cancel: "Anuluj",
"Powered by": "Napędzane przez",
shrinkDatabaseDescription: "Uruchum VACUUM na bazie SQLite. Jeżeli twoja baza została stworzona po wersji 1.10.0, to posiada już włączoną opcję AUTO_VACUUM i stosowanie ręcznego oczyszczania nie jest potrzbne.",
shrinkDatabaseDescription: "Uruchom VACUUM na bazie SQLite. Jeżeli twoja baza została stworzona po wersji 1.10.0, to posiada już włączoną opcję AUTO_VACUUM i stosowanie ręcznego oczyszczania nie jest potrzebne.",
clicksendsms: "ClickSend SMS",
apiCredentials: "Poświadczenia API",
serwersms: "SerwerSMS.pl",
@ -355,10 +355,10 @@ export default {
smtpDkimSettings: "Ustawienia DKIM",
smtpDkimDesc: "Zapoznaj się z Nodemailer DKIM {0}, aby dowiedzieć się więcej",
documentation: "dokumentacja",
smtpDkimDomain: "Nazwa Domeny",
smtpDkimDomain: "Nazwa domeny",
smtpDkimKeySelector: "Selektor klucza",
smtpDkimPrivateKey: "Klucz Prywatny",
smtpDkimHashAlgo: "Algorytm Hashowania (Opcjonalne)",
smtpDkimheaderFieldNames: "Klucze nagłówka do podpisu (Opcjonalne)",
smtpDkimskipFields: "Klucze nagłówka do pominięcia (Opcjonalne)",
smtpDkimPrivateKey: "Klucz prywatny",
smtpDkimHashAlgo: "Algorytm Hashowania (opcjonalne)",
smtpDkimheaderFieldNames: "Klucze nagłówka do podpisu (opcjonalne)",
smtpDkimskipFields: "Klucze nagłówka do pominięcia (opcjonalne)",
};

View file

@ -317,4 +317,15 @@ export default {
"Cancel": "Отмена",
"Created:": "Создано:",
"Show Tags": "Показать тэги",
"Recent": "Текущее",
"3h": "3 часа",
"6h": "6 часов",
"24h": "24 часа",
"1w": "1 неделя",
"No monitors available.": "Нет доступных мониторов",
"Add one": "Добавить новый",
"Backup": "Резервная копия",
"Security": "Безопасность",
"Current User:": "Текущий пользователь:",
"All Systems Operational": "Все системы работают",
};

View file

@ -2,9 +2,9 @@ export default {
languageName: "Slovenščina",
checkEverySecond: "Preveri na vsakih {0} sekund",
retryCheckEverySecond: "Ponovno poskusi na vsakih {0} sekund",
retriesDescription: "Maksimalno število poskusov predenj se storitev označi kot nedosegljiva in se pošlje obvestilo",
retriesDescription: "Maksimalno število poskusov predenj se storitev označi kot 'ne deluje' in se pošlje obvestilo",
ignoreTLSError: "Ignoriraj TLS/SSL napake za HTTPS spletne strani",
upsideDownModeDescription: "Negiraj status. Če je storitev dosegljiva je NEDOSEGLJIVA.",
upsideDownModeDescription: "Negiraj status. Če je storitev deluje bo označena kot 'ne deluje'.",
maxRedirectDescription: "Maksimalno število sledečih preusmeritev. 0 onemogoči preusmeritve.",
acceptedStatusCodesDescription: "Izberi kode statusa veljavna kot uspešen odgovor.",
passwordNotMatchMsg: "Ponovljeno geslo se ne ujema.",
@ -40,8 +40,8 @@ export default {
Add: "Dodaj",
"Add New Monitor": "Dodaj nov monitor",
"Quick Stats": "Hitro stanje",
Up: "Dosegljiv",
Down: "Nedosegljiv",
Up: "Deluje",
Down: "Ne deluje",
Pending: "Na čakanju",
Unknown: "Neznano",
Pause: "Pavza",

View file

@ -291,4 +291,75 @@ export default {
"Internal Room Id": "Internal Room Id",
matrixDesc1: "你可以在 Matrix 客户端房间设置的高级选项找到 Internal Room Id。格式类似于 !QMdRCpUIfLwsfjxye6:home.server。",
matrixDesc2: "请不要使用你自己的 Access Token这将开放你所有的账户权限和你加入的房间权限。你可以创建一个新的用户并邀请它至你允许的的房间中。你可以运行以下命令来获取 Access Token{0}",
emailCustomSubject: "邮件主题",
clicksendsms: "ClickSend SMS",
GoogleChat: "Google Chat (Google Workspace only)",
apiCredentials: "API credentials",
Method: "方法",
Body: "请求体",
Headers: "请求头",
PushUrl: "Push URL",
HeadersInvalidFormat: "请求头不是有效的JSON: ",
BodyInvalidFormat: "请求体不是有效的JSON: ",
"Monitor History": "监控历史数据",
clearDataOlderThan: "保留监控历史数据 {0} 天",
PasswordsDoNotMatch: "密码不匹配",
records: "records",
"One record": "One record",
steamApiKeyDescription: "为了监控Steam游戏服务器你需要一个Steam Web-API key。你可以在这里注册你的API密钥: ",
"Current User": "当前用户",
recent: "最近",
Done: "完成",
Info: "信息",
Security: "安全性",
"Steam API Key": "Steam API Key",
"Shrink Database": "缩小数据库",
"Pick a RR-Type...": "选择资源记录类型...",
"Pick Accepted Status Codes...": "选择有效的状态码...",
Default: "默认",
"HTTP Options": "HTTP 选项",
"Create Incident": "创建事件",
Title: "标题",
Content: "内容",
Style: "类型",
info: "info",
warning: "warning",
danger: "danger",
primary: "primary",
light: "light",
dark: "dark",
Post: "发布",
"Please input title and content": "请输入标题和内容",
Created: "创建于",
"Last Updated": "最后更新",
Unpin: "删除",
"Switch to Light Theme": "切换到浅色主题",
"Switch to Dark Theme": "切换到深色主题",
"Show Tags": "显示标签",
"Hide Tags": "隐藏标签",
Description: "描述",
"No monitors available.": "没有可用的监控项",
"Add one": "Add one",
"No Monitors": "没有监控项",
"Untitled Group": "无标题的分组",
Services: "服务",
Discard: "取消",
Cancel: "取消",
"Powered by": "Powered by",
shrinkDatabaseDescription: "这将触发SQLite数据库的 VACUUM 命令如果您的数据库是在1.10.0版本之后创建的AUTO_VACUUM已经启用了则不需要再使用此功能",
serwersms: "SerwerSMS.pl",
serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
serwersmsAPIPassword: "API Password",
serwersmsPhoneNumber: "Phone number",
serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
stackfield: "Stackfield",
smtpDkimSettings: "DKIM Settings",
smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
documentation: "documentation",
smtpDkimDomain: "域名",
smtpDkimKeySelector: "Key Selector",
smtpDkimPrivateKey: "Private Key",
smtpDkimHashAlgo: "Hash Algorithm (可选)",
smtpDkimheaderFieldNames: "Header Keys to sign (可选)",
smtpDkimskipFields: "Header Keys not to sign (可选)",
};