diff --git a/CHANGELOG.md b/CHANGELOG.md index bf360970..8e237e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.90.54 (06-17-2020) +- Fixed Slack Notifier's failure/success data saving issue +- Added additional i18n Languages (help needed!) + # 0.90.53 (06-16-2020) - Modified most of the key's for prometheus metrics - Added Database Stats in prometheus metrics diff --git a/frontend/src/components/Dashboard/Cache.vue b/frontend/src/components/Dashboard/Cache.vue index 18a0bc26..1577c90b 100644 --- a/frontend/src/components/Dashboard/Cache.vue +++ b/frontend/src/components/Dashboard/Cache.vue @@ -1,5 +1,7 @@ + + + diff --git a/frontend/src/components/Index/Footer.vue b/frontend/src/components/Index/Footer.vue index 8083d947..31ab4b15 100644 --- a/frontend/src/components/Index/Footer.vue +++ b/frontend/src/components/Index/Footer.vue @@ -2,9 +2,9 @@ diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue index 1dc4af14..bfd15daf 100644 --- a/frontend/src/components/Service/ServiceBlock.vue +++ b/frontend/src/components/Service/ServiceBlock.vue @@ -62,7 +62,7 @@
diff --git a/frontend/src/components/Service/ServiceInfo.vue b/frontend/src/components/Service/ServiceInfo.vue index 9b8226c5..93a4a480 100644 --- a/frontend/src/components/Service/ServiceInfo.vue +++ b/frontend/src/components/Service/ServiceInfo.vue @@ -17,7 +17,7 @@
- okko + Current Downtime
diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue index e6baf0f3..f35ac058 100644 --- a/frontend/src/components/Service/ServiceTopStats.vue +++ b/frontend/src/components/Service/ServiceTopStats.vue @@ -2,15 +2,15 @@
{{humanTime(service.avg_response)}} - Average Response + {{$t('service.average')}}
{{service.online_24_hours}} % - Uptime last 24 Hours + {{$t('service.last_uptime', [24, $tc('hour', 24)])}}
{{service.online_7_days}} % - Uptime last 7 Days + {{$t('service.last_uptime', [7, $tc('day', 7)])}}
diff --git a/frontend/src/forms/CoreSettings.vue b/frontend/src/forms/CoreSettings.vue index bb46e410..d8b95dda 100644 --- a/frontend/src/forms/CoreSettings.vue +++ b/frontend/src/forms/CoreSettings.vue @@ -33,7 +33,7 @@
- @@ -84,7 +84,7 @@ await Api.core_save(c) const core = await Api.core() this.$store.commit('setCore', core) - setInterval(() => { this.loading = false }, 1500) + this.loading = false }, selectAll() { this.$refs.input.select(); diff --git a/frontend/src/forms/Login.vue b/frontend/src/forms/Login.vue index d48aa275..098abe60 100644 --- a/frontend/src/forms/Login.vue +++ b/frontend/src/forms/Login.vue @@ -2,13 +2,13 @@
- +
- +
@@ -16,10 +16,10 @@
diff --git a/frontend/src/languages/english.js b/frontend/src/languages/english.js index 404ad6dc..45b06a61 100644 --- a/frontend/src/languages/english.js +++ b/frontend/src/languages/english.js @@ -33,7 +33,11 @@ const english = { title: 'Title', begins: 'Begins', name: 'Name', - visibility: 'Visibility' + loading: 'Loading', + login: 'Login', + sign_in: "Sign In", + visibility: 'Visibility', + wrong_login: 'Incorrect username or password' }, settings: { name: "Project Name", @@ -42,12 +46,23 @@ const english = { footer_notes: "HTML is allowed inside the footer", error_reporting: "Enable Error Reporting", error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.", - save: "Save Settings" + save: "Save Settings", + main: "Main Settings", + theme: "Theme Editor", + cache: "Cache", + oauth: "OAuth", + beta: "BETA", + changelog: "Changelog", + repo: "Statping Github Repo", + docs: "Documentation", }, service: { name: "Service Name", type: "Service Type", - info: "Service Information" + info: "Service Information", + view: "View Service", + average: "Average Response", + last_uptime: "Uptime last {0} {1}", }, email: "Email Address", port: "Database Port", diff --git a/frontend/src/languages/french.js b/frontend/src/languages/french.js index 4e899d8f..5ce86045 100644 --- a/frontend/src/languages/french.js +++ b/frontend/src/languages/french.js @@ -1,19 +1,100 @@ const french = { - setup: { - language: "Langue", - database_connection: "Database Connection" + top_nav: { + dashboard: "Dashboard", + services: "Services", + users: "Users", + groups: "Groups", + announcements: "Announcements", + settings: "Settings", + logs: "Logs", + logout: 'Logout', }, - service: 'service', + setup: { + language: "Language", + connection: "Database Connection", + host: "Host", + database: "Database", + project_name: "Project Name", + project_description: "Project Description", + domain: "Domain URL", + username: "Admin Username", + password: "Admin Password", + password_confirm: "Confirm Admin Password", + newsletter: "Newsletter", + newsletter_note: "We will not share your email, emails are only for major updates.", + send_reports: "Send Error Reports to Statping" + }, + dashboard: { + total_services: "Total Services", + failures_24_hours: "Failures last 24 Hours", + online_services: "Online Services", + service: 'Service | Services', + group: 'Group', + title: 'Title', + begins: 'Begins', + name: 'Name', + loading: 'Loading', + login: 'Login', + sign_in: "Sign In", + visibility: 'Visibility', + wrong_login: 'Incorrect username or password' + }, + settings: { + name: "Project Name", + description: "Project Name", + footer: "Custom Footer", + footer_notes: "HTML is allowed inside the footer", + error_reporting: "Enable Error Reporting", + error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.", + save: "Save Settings", + main: "Main Settings", + theme: "Theme Editor", + cache: "Cache", + oauth: "OAuth", + beta: "BETA", + changelog: "Changelog", + repo: "Statping Github Repo", + docs: "Documentation", + }, + service: { + name: "Service Name", + type: "Service Type", + info: "Service Information", + view: "View Service", + average: "Average Response", + last_uptime: "Uptime last {0} {1}", + }, + email: "Email Address", + port: "Database Port", + setting: "Settings", + username: "Username", + password: 'Password', + services: 'Services', + domain: 'Domain', online: 'online', + public: 'Public', + private: 'Private', + admin: 'Admin', offline: 'offline', - incident: 'incident', - group: 'group', + failure: 'failure | failures', + incident: 'incident | incidents', + checkin: 'checkin | checkins', + user: 'User | Users', + group: 'Group', message: 'message', - logout: 'logout', + edit: 'Edit', + type: 'Type', sample_data: 'Sample Data', today: 'Today', - day: 'day', - hour: 'hour', + last_login: 'Last Login', + uptime: '{0}% Uptime', + close: 'Close', + second: 'second | seconds', + minute: 'minute | minutes', + hour: 'hour | hours', + day: 'day | days', + week: 'week | weeks', + month: 'month | months', } export default french diff --git a/frontend/src/languages/german.js b/frontend/src/languages/german.js index 47afbb6c..a828e7cf 100644 --- a/frontend/src/languages/german.js +++ b/frontend/src/languages/german.js @@ -1,19 +1,100 @@ const german = { - setup: { - language: "Sprache", - database_connection: "Database Connection" + top_nav: { + dashboard: "Dashboard", + services: "Services", + users: "Users", + groups: "Groups", + announcements: "Announcements", + settings: "Settings", + logs: "Logs", + logout: 'Logout', }, - service: 'service', + setup: { + language: "Language", + connection: "Database Connection", + host: "Host", + database: "Database", + project_name: "Project Name", + project_description: "Project Description", + domain: "Domain URL", + username: "Admin Username", + password: "Admin Password", + password_confirm: "Confirm Admin Password", + newsletter: "Newsletter", + newsletter_note: "We will not share your email, emails are only for major updates.", + send_reports: "Send Error Reports to Statping" + }, + dashboard: { + total_services: "Total Services", + failures_24_hours: "Failures last 24 Hours", + online_services: "Online Services", + service: 'Service | Services', + group: 'Group', + title: 'Title', + begins: 'Begins', + name: 'Name', + loading: 'Loading', + login: 'Login', + sign_in: "Sign In", + visibility: 'Visibility', + wrong_login: 'Incorrect username or password' + }, + settings: { + name: "Project Name", + description: "Project Name", + footer: "Custom Footer", + footer_notes: "HTML is allowed inside the footer", + error_reporting: "Enable Error Reporting", + error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.", + save: "Save Settings", + main: "Main Settings", + theme: "Theme Editor", + cache: "Cache", + oauth: "OAuth", + beta: "BETA", + changelog: "Changelog", + repo: "Statping Github Repo", + docs: "Documentation", + }, + service: { + name: "Service Name", + type: "Service Type", + info: "Service Information", + view: "View Service", + average: "Average Response", + last_uptime: "Uptime last {0} {1}", + }, + email: "Email Address", + port: "Database Port", + setting: "Settings", + username: "Username", + password: 'Password', + services: 'Services', + domain: 'Domain', online: 'online', + public: 'Public', + private: 'Private', + admin: 'Admin', offline: 'offline', - incident: 'incident', - group: 'group', + failure: 'failure | failures', + incident: 'incident | incidents', + checkin: 'checkin | checkins', + user: 'User | Users', + group: 'Group', message: 'message', - logout: 'logout', + edit: 'Edit', + type: 'Type', sample_data: 'Sample Data', today: 'Today', - day: 'day', - hour: 'hour', + last_login: 'Last Login', + uptime: '{0}% Uptime', + close: 'Close', + second: 'second | seconds', + minute: 'minute | minutes', + hour: 'hour | hours', + day: 'day | days', + week: 'week | weeks', + month: 'month | months', } export default german diff --git a/frontend/src/languages/russian.js b/frontend/src/languages/russian.js index b1a07ffe..9eccf7d7 100644 --- a/frontend/src/languages/russian.js +++ b/frontend/src/languages/russian.js @@ -1,19 +1,100 @@ const russian = { - setup: { - language: "язык", - database_connection: "Database Connection" + top_nav: { + dashboard: "Dashboard", + services: "Services", + users: "Users", + groups: "Groups", + announcements: "Announcements", + settings: "Settings", + logs: "Logs", + logout: 'Logout', }, - service: 'service', - online: 'online', - offline: 'offline', - incident: 'incident', - group: 'group', + setup: { + language: "Language", + connection: "Database Connection", + host: "Host", + database: "Database", + project_name: "Project Name", + project_description: "Project Description", + domain: "Domain URL", + username: "Admin Username", + password: "Admin Password", + password_confirm: "Confirm Admin Password", + newsletter: "Newsletter", + newsletter_note: "We will not share your email, emails are only for major updates.", + send_reports: "Send Error Reports to Statping" + }, + dashboard: { + total_services: "Total Services", + failures_24_hours: "Failures last 24 Hours", + online_services: "Online Services", + service: 'Service | Services', + group: 'Group', + title: 'Title', + begins: 'Begins', + name: 'Name', + loading: 'Loading', + login: 'Login', + sign_in: "Sign In", + visibility: 'Visibility', + wrong_login: 'Incorrect username or password' + }, + settings: { + name: "Project Name", + description: "Project Name", + footer: "Custom Footer", + footer_notes: "HTML is allowed inside the footer", + error_reporting: "Enable Error Reporting", + error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.", + save: "Save Settings", + main: "Main Settings", + theme: "Theme Editor", + cache: "Cache", + oauth: "OAuth", + beta: "BETA", + changelog: "Changelog", + repo: "Statping Github Repo", + docs: "Documentation", + }, + service: { + name: "Service Name", + type: "Service Type", + info: "Service Information", + view: "View Service", + average: "Average Response", + last_uptime: "Uptime last {0} {1}", + }, + email: "Email Address", + port: "Database Port", + setting: "Settings", + username: "Username", + password: 'Password', + services: 'Services', + domain: 'Domain', + online: 'онлайн', + public: 'Public', + private: 'Private', + admin: 'Admin', + offline: 'не в сети', + failure: 'failure | failures', + incident: 'incident | incidents', + checkin: 'checkin | checkins', + user: 'User | Users', + group: 'Group', message: 'message', - logout: 'logout', + edit: 'Edit', + type: 'Type', sample_data: 'Sample Data', today: 'Today', - day: 'day', - hour: 'hour', + last_login: 'Last Login', + uptime: '{0}% Uptime', + close: 'близко', + second: 'второй | секунд', + minute: 'минут | минут', + hour: 'час | часов', + day: 'день | дней', + week: 'неделя | недель', + month: 'месяц | месяцы', } export default russian diff --git a/frontend/src/languages/spanish.js b/frontend/src/languages/spanish.js index fc7ac5fb..3e6a8cb0 100644 --- a/frontend/src/languages/spanish.js +++ b/frontend/src/languages/spanish.js @@ -1,19 +1,100 @@ const spanish = { - setup: { - language: "Idioma", - database_connection: "Database Connection" + top_nav: { + dashboard: "Dashboard", + services: "Services", + users: "Users", + groups: "Groups", + announcements: "Announcements", + settings: "Settings", + logs: "Logs", + logout: 'Logout', }, - service: 'service', + setup: { + language: "Language", + connection: "Database Connection", + host: "Host", + database: "Database", + project_name: "Project Name", + project_description: "Project Description", + domain: "Domain URL", + username: "Admin Username", + password: "Admin Password", + password_confirm: "Confirm Admin Password", + newsletter: "Newsletter", + newsletter_note: "We will not share your email, emails are only for major updates.", + send_reports: "Send Error Reports to Statping" + }, + dashboard: { + total_services: "Total Services", + failures_24_hours: "Failures last 24 Hours", + online_services: "Online Services", + service: 'Service | Services', + group: 'Group', + title: 'Title', + begins: 'Begins', + name: 'Name', + loading: 'Loading', + login: 'Login', + sign_in: "Sign In", + visibility: 'Visibility', + wrong_login: 'Incorrect username or password' + }, + settings: { + name: "Project Name", + description: "Project Name", + footer: "Custom Footer", + footer_notes: "HTML is allowed inside the footer", + error_reporting: "Enable Error Reporting", + error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.", + save: "Save Settings", + main: "Main Settings", + theme: "Theme Editor", + cache: "Cache", + oauth: "OAuth", + beta: "BETA", + changelog: "Changelog", + repo: "Statping Github Repo", + docs: "Documentation", + }, + service: { + name: "Service Name", + type: "Service Type", + info: "Service Information", + view: "View Service", + average: "Average Response", + last_uptime: "Uptime last {0} {1}", + }, + email: "Email Address", + port: "Database Port", + setting: "Settings", + username: "Username", + password: 'Password', + services: 'Services', + domain: 'Domain', online: 'online', + public: 'Public', + private: 'Private', + admin: 'Admin', offline: 'offline', - incident: 'incident', - group: 'group', + failure: 'failure | failures', + incident: 'incident | incidents', + checkin: 'checkin | checkins', + user: 'User | Users', + group: 'Group', message: 'message', - logout: 'logout', + edit: 'Edit', + type: 'Type', sample_data: 'Sample Data', today: 'Today', - day: 'day', - hour: 'hour', + last_login: 'Last Login', + uptime: '{0}% Uptime', + close: 'Close', + second: 'second | seconds', + minute: 'minute | minutes', + hour: 'hour | hours', + day: 'day | days', + week: 'week | weeks', + month: 'month | months', } export default spanish diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js index 65b6b4ba..e1c3cdcc 100644 --- a/frontend/src/mixin.js +++ b/frontend/src/mixin.js @@ -20,7 +20,7 @@ export default Vue.mixin({ return startOfToday() }, secondsHumanize (val) { - return `${val} seconds` + return `${val} ${this.$t('second', val)}` }, utc(val) { return new Date.UTC(val) @@ -175,7 +175,7 @@ export default Vue.mixin({ return startOfMonth(date) }, lastDayOfMonth(month) { - return lastDayOfMonth(date) + return lastDayOfMonth(month) }, addMonths(date, amount) { return addMonths(date, amount) diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue index 9037405a..f67cdf9c 100644 --- a/frontend/src/pages/Settings.vue +++ b/frontend/src/pages/Settings.vue @@ -3,19 +3,19 @@