topaLE
/
uptime-kuma
1
0
Fork 0
Code Issues 185 Pull Requests 26 Projects Releases 28 Wiki Activity
Browse Source

Merge remote-tracking branch 'louislam/master' into feature/translations-extraction-script

bertyhell/feature/translations-extraction-script
Bert Verhelst 4 years ago
parent
fbfa75cf70 6dd0e082b4
commit
f1931b8c26
6 changed files with 89 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .github/FUNDING.yml
  2. 2
      README.md
  3. 4
      server/model/monitor.js
  4. 4
      server/server.js
  5. 146
      src/languages/ko-KR.js
  6. 7
      src/pages/Details.vue

2
.github/FUNDING.yml
View File

@ -1,6 +1,6 @@
# These are supported funding model platforms # These are supported funding model platforms
#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] github: louislam # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
#patreon: # Replace with a single Patreon username #patreon: # Replace with a single Patreon username
open_collective: uptime-kuma # Replace with a single Open Collective username open_collective: uptime-kuma # Replace with a single Open Collective username
#ko_fi: # Replace with a single Ko-fi username #ko_fi: # Replace with a single Ko-fi username

2
README.md
View File

@ -92,7 +92,7 @@ Light Mode:
Status Page: Status Page:
<img src="https://user-images.githubusercontent.com/1336778/133384019-962e1120-6c3a-481f-9d07-d7df765e9ba4.png" width="512" alt="" /> <img src="https://user-images.githubusercontent.com/1336778/134628766-a3fe0981-0926-4285-ab46-891a21c3e4cb.png" width="512" alt="" />
Settings Page: Settings Page:

4
server/model/monitor.js
View File

@ -12,6 +12,7 @@ const { R } = require("redbean-node");
const { BeanModel } = require("redbean-node/dist/bean-model"); const { BeanModel } = require("redbean-node/dist/bean-model");
const { Notification } = require("../notification"); const { Notification } = require("../notification");
const version = require("../../package.json").version; const version = require("../../package.json").version;
const apicache = require("../modules/apicache");
/** /**
* status: * status:
@ -333,6 +334,9 @@ class Monitor extends BeanModel {
console.log(e); console.log(e);
} }
} }
// Clear Status Page Cache
apicache.clear();
} }
} else { } else {

4
server/server.js
View File

@ -1041,6 +1041,10 @@ exports.entryPage = "dashboard";
notificationIDList: {}, notificationIDList: {},
}; };
if (monitorListData[i].pushToken) {
monitor.pushToken = monitorListData[i].pushToken;
}
let bean = R.dispense("monitor"); let bean = R.dispense("monitor");
let notificationIDList = monitor.notificationIDList; let notificationIDList = monitor.notificationIDList;

146
src/languages/ko-KR.js
View File

@ -108,78 +108,78 @@ export default {
"Repeat Password": "비밀번호 재입력", "Repeat Password": "비밀번호 재입력",
respTime: "응답 시간 (ms)", respTime: "응답 시간 (ms)",
notAvailableShort: "N/A", notAvailableShort: "N/A",
Create: "Create", Create: "생성하기",
clearEventsMsg: "Are you sure want to delete all events for this monitor?", clearEventsMsg: "정말로 이 모니터링부터 모든 이벤트를 제거할까요?",
clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?", clearHeartbeatsMsg: "정말로 이 모니터링부터 모든 하트비트를 제거할까요?",
confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?", confirmClearStatisticsMsg: "정말로 모든 통계치를 제거할까요?",
"Clear Data": "Clear Data", "Clear Data": "데이터 클리어",
Events: "Events", Events: "이벤트",
Heartbeats: "Heartbeats", Heartbeats: "하트비트",
"Auto Get": "Auto Get", "Auto Get": "자동 Get",
enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", enableDefaultNotificationDescription: "모든 모니터링에 이 알림이 기본값으로 설정될거에요. 각각 모니터링에서 이 알림을 비활성화 할 수 있어요.",
"Default enabled": "Default enabled", "Default enabled": "기본값 ",
"Also apply to existing monitors": "Also apply to existing monitors", "Also apply to existing monitors": "기존 모니터링에도 적용되요.",
Export: "Export", Export: "내보내기",
Import: "Import", Import: "가져오기",
backupDescription: "You can backup all monitors and all notifications into a JSON file.", backupDescription: "모든 모니터링과 알림을 JSON 파일 형식에 저장할 수 있어요.",
backupDescription2: "PS: History and event data is not included.", backupDescription2: "(히스토리와 이벤트 데이터는 포함되어 있지 않아요.)",
backupDescription3: "Sensitive data such as notification tokens is included in the export file, please keep it carefully.", backupDescription3: "알림 토큰과 같은 보안 데이터가 내보내기 파일에 포함되어 있으므로 관리에 주의해주세요.",
alertNoFile: "Please select a file to import.", alertNoFile: "가져오기를 하기 위해 파일을 선택해주세요.",
alertWrongFileType: "Please select a JSON file.", alertWrongFileType: "JSON 파일을 선택해주세요.",
twoFAVerifyLabel: "Please type in your token to verify that 2FA is working", twoFAVerifyLabel: "2단계 인증이 정상적으로 등록됬는지 확인하기 위해 토큰을 입력해주세요.",
tokenValidSettingsMsg: "Token is valid! You can now save the 2FA settings.", tokenValidSettingsMsg: "토큰이 정상 값 이에요! 2단계 인증 설정을 저장할 수 있어요.",
confirmEnableTwoFAMsg: "Are you sure you want to enable 2FA?", confirmEnableTwoFAMsg: "정말로 2단계 인증을 활성화 할까요?",
confirmDisableTwoFAMsg: "Are you sure you want to disable 2FA?", confirmDisableTwoFAMsg: "정말로 2단계 인증을 비활성화 할까요?",
"Apply on all existing monitors": "Apply on all existing monitors", "Apply on all existing monitors": "기존 모니터링에 모두 적용하기",
"Verify Token": "Verify Token", "Verify Token": "토큰 검증",
"Setup 2FA": "Setup 2FA", "Setup 2FA": "2단계 인증 설정하기",
"Enable 2FA": "Enable 2FA", "Enable 2FA": "2단계 인증 활성화",
"Disable 2FA": "Disable 2FA", "Disable 2FA": "2단계 인증 비활성화",
"2FA Settings": "2FA Settings", "2FA Settings": "2단계 인증 설정",
"Two Factor Authentication": "Two Factor Authentication", "Two Factor Authentication": "2단계 인증",
Active: "Active", Active: "활성화",
Inactive: "Inactive", Inactive: "비활성화",
Token: "Token", Token: "토큰",
"Show URI": "Show URI", "Show URI": "URI 보기",
"Clear all statistics": "Clear all Statistics", "Clear all statistics": "모든 통계치 ",
retryCheckEverySecond: "Retry every {0} seconds.", retryCheckEverySecond: "{0} 초마다 재시도",
importHandleDescription: "Choose 'Skip existing' if you want to skip every monitor or notification with the same name. 'Overwrite' will delete every existing monitor and notification.", importHandleDescription: "같은 이름을 가진 모든 모니터링 또는 알림들을 건너뛰기를 원하시면, '기존값 건너뛰기'를 눌러주세요. 기존 모니터링과 알림을 지우고 싶으면, '덮어쓰기'를 눌러주세요.",
confirmImportMsg: "Are you sure to import the backup? Please make sure you've selected the right import option.", confirmImportMsg: "정말로 백업을 가져올까요? 정확한 백업 설정인지 다시 확인해주세요.",
"Heartbeat Retry Interval": "Heartbeat Retry Interval", "Heartbeat Retry Interval": "하트비트 재시도 주기",
"Import Backup": "Import Backup", "Import Backup": "백업 가져오기",
"Export Backup": "Export Backup", "Export Backup": "백업 내보내기",
"Skip existing": "Skip existing", "Skip existing": "기존값 건너뛰기",
Overwrite: "Overwrite", Overwrite: "덮어쓰기",
Options: "Options", Options: "옵션",
"Keep both": "Keep both", "Keep both": "두개 모두 보존",
Tags: "Tags", Tags: "태그",
"Add New below or Select...": "Add New below or Select...", "Add New below or Select...": "아래 새롭게 추가 또는 선택...",
"Tag with this name already exist.": "Tag with this name already exist.", "Tag with this name already exist.": "같은 태그 이름이 이미 존재해요.",
"Tag with this value already exist.": "Tag with this value already exist.", "Tag with this value already exist.": "같은 값을 가진 태그가 이미 존재해요.",
color: "color", color: "색상",
"value (optional)": "value (optional)", "value (optional)": "값 (선택)",
Gray: "Gray", Gray: "회색",
Red: "Red", Red: "빨강색",
Orange: "Orange", Orange: "주황색",
Green: "Green", Green: "초록색",
Blue: "Blue", Blue: "파랑색",
Indigo: "Indigo", Indigo: "남색",
Purple: "Purple", Purple: "보라색",
Pink: "Pink", Pink: "핑크색",
"Search...": "Search...", "Search...": "검색...",
"Avg. Ping": "Avg. Ping", "Avg. Ping": "평균 핑",
"Avg. Response": "Avg. Response", "Avg. Response": "평균 응답",
"Entry Page": "Entry Page", "Entry Page": "첫 페이지",
statusPageNothing: "Nothing here, please add a group or a monitor.", statusPageNothing: "아무것도 없어요. 새로운 그룹 또는 모니터링을 추가해주세요.",
"No Services": "No Services", "No Services": "서비스 없음",
"All Systems Operational": "All Systems Operational", "All Systems Operational": "모든 시스템 정상",
"Partially Degraded Service": "Partially Degraded Service", "Partially Degraded Service": "일부 시스템 비정상",
"Degraded Service": "Degraded Service", "Degraded Service": "모든 시스템 비정상",
"Add Group": "Add Group", "Add Group": "그룹 추가",
"Add a monitor": "Add a monitor", "Add a monitor": "모니터링 추가r",
"Edit Status Page": "Edit Status Page", "Edit Status Page": "상태 페이지 수정",
"Go to Dashboard": "Go to Dashboard", "Go to Dashboard": "대쉬보드로 가기",
"Status Page": "Status Page", "Status Page": "상태 페이지",
telegram: "Telegram", telegram: "Telegram",
webhook: "Webhook", webhook: "Webhook",
smtp: "Email (SMTP)", smtp: "Email (SMTP)",
@ -194,7 +194,7 @@ export default {
octopush: "Octopush", octopush: "Octopush",
promosms: "PromoSMS", promosms: "PromoSMS",
lunasea: "LunaSea", lunasea: "LunaSea",
apprise: "Apprise (Support 50+ Notification services)", apprise: "Apprise (50개 이상 알림 서비스 )",
pushbullet: "Pushbullet", pushbullet: "Pushbullet",
line: "Line Messenger", line: "Line Messenger",
mattermost: "Mattermost", mattermost: "Mattermost",

7
src/pages/Details.vue
View File

@ -83,6 +83,7 @@
</div> </div>
</div> </div>
<!-- Cert Info Box -->
<transition name="slide-fade" appear> <transition name="slide-fade" appear>
<div v-if="showCertInfoBox" class="shadow-box big-padding text-center"> <div v-if="showCertInfoBox" class="shadow-box big-padding text-center">
<div class="row"> <div class="row">
@ -93,6 +94,7 @@
</div> </div>
</transition> </transition>
<!-- Ping Chart -->
<div v-if="showPingChartBox" class="shadow-box big-padding text-center ping-chart-wrapper"> <div v-if="showPingChartBox" class="shadow-box big-padding text-center ping-chart-wrapper">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
@ -270,7 +272,10 @@ export default {
}, },
tlsInfo() { tlsInfo() {
if (this.$root.tlsInfoList[this.monitor.id]) { // Add: this.$root.tlsInfoList[this.monitor.id].certInfo
// Fix: TypeError: Cannot read properties of undefined (reading 'validTo')
// Reason: TLS Info object format is changed in 1.8.0, if for some reason, it cannot connect to the site after update to 1.8.0, the object is still in the old format.
if (this.$root.tlsInfoList[this.monitor.id] && this.$root.tlsInfoList[this.monitor.id].certInfo) {
return this.$root.tlsInfoList[this.monitor.id]; return this.$root.tlsInfoList[this.monitor.id];
} }

Write Preview
Loading…
Cancel
Save