From 316a9df0fa70ae65847e7daed074b07323f77a4e Mon Sep 17 00:00:00 2001 From: thatInfrastructureGuy Date: Thu, 17 Dec 2020 20:26:45 -0800 Subject: [PATCH 1/5] Fix the wording uptime. Signed-off-by: thatInfrastructureGuy --- frontend/src/components/Service/ServiceTopStats.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue index 9104b549..e4058ebf 100644 --- a/frontend/src/components/Service/ServiceTopStats.vue +++ b/frontend/src/components/Service/ServiceTopStats.vue @@ -6,11 +6,11 @@
{{service.online_24_hours}} % - {{$t('last_uptime', [24, $tc('hour', 24)])}} + {{$t('last_uptime')}} 24 {{$t('hours')}}
{{service.online_7_days}} % - {{$t('last_uptime', [7, $tc('day', 7)])}} + {{$t('last_uptime')}} 7 {{$t('days')}}
From f6553893d7963fa4bae87ee630155962ca63f6a2 Mon Sep 17 00:00:00 2001 From: thatInfrastructureGuy Date: Fri, 18 Dec 2020 09:28:29 -0800 Subject: [PATCH 2/5] Use vue's i18n package to make words plural Signed-off-by: thatInfrastructureGuy --- frontend/src/components/Service/ServiceTopStats.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue index e4058ebf..9a9f7576 100644 --- a/frontend/src/components/Service/ServiceTopStats.vue +++ b/frontend/src/components/Service/ServiceTopStats.vue @@ -6,11 +6,11 @@
{{service.online_24_hours}} % - {{$t('last_uptime')}} 24 {{$t('hours')}} + {{$t('last_uptime')}} 24 {{$tc('hour', 24)}}
{{service.online_7_days}} % - {{$t('last_uptime')}} 7 {{$t('days')}} + {{$t('last_uptime')}} 7 {{$tc('day', 24)}}
From aeb5e9dad987047b1b926222c987ff5d4a29308f Mon Sep 17 00:00:00 2001 From: thatInfrastructureGuy Date: Fri, 18 Dec 2020 09:29:29 -0800 Subject: [PATCH 3/5] typo fix Signed-off-by: thatInfrastructureGuy --- frontend/src/components/Service/ServiceTopStats.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue index 9a9f7576..0a9a48ef 100644 --- a/frontend/src/components/Service/ServiceTopStats.vue +++ b/frontend/src/components/Service/ServiceTopStats.vue @@ -10,7 +10,7 @@
{{service.online_7_days}} % - {{$t('last_uptime')}} 7 {{$tc('day', 24)}} + {{$t('last_uptime')}} 7 {{$tc('day', 7)}}
From 69e4d7aa392e11708a5ecdbed39cb68d822c9693 Mon Sep 17 00:00:00 2001 From: thatInfrastructureGuy Date: Mon, 21 Dec 2020 17:51:15 -0800 Subject: [PATCH 4/5] Add language plurals Signed-off-by: thatInfrastructureGuy --- frontend/src/languages/chinese.js | 6 +++--- frontend/src/languages/english.js | 12 ++++++------ frontend/src/languages/french.js | 10 +++++----- frontend/src/languages/german.js | 12 ++++++------ frontend/src/languages/italian.js | 10 +++++----- frontend/src/languages/japanese.js | 12 ++++++------ frontend/src/languages/korean.js | 4 ++-- frontend/src/languages/russian.js | 10 +++++----- frontend/src/languages/spanish.js | 12 ++++++------ 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/frontend/src/languages/chinese.js b/frontend/src/languages/chinese.js index e594cf48..f8ecb465 100755 --- a/frontend/src/languages/chinese.js +++ b/frontend/src/languages/chinese.js @@ -52,8 +52,8 @@ const chinese = { days_ago: "天前", today: "今天", week: "周", - month: "月份", - day: "日", + month: "月份 | 月数", + day: "日 | 天数", hour: "小时", minute: "分钟", failures_24_hours: "过去 24 小时失败", @@ -139,4 +139,4 @@ const chinese = { service_create: "创建服务" } -export default chinese \ No newline at end of file +export default chinese diff --git a/frontend/src/languages/english.js b/frontend/src/languages/english.js index cd34b643..b55843e1 100644 --- a/frontend/src/languages/english.js +++ b/frontend/src/languages/english.js @@ -51,11 +51,11 @@ const english = { service_offline_time: "Service has been offline for", days_ago: "Days Ago", today: "Today", - week: "Week", - month: "Month", - day: "Day", - hour: "Hour", - minute: "Minute", + week: "Week | Weeks", + month: "Month | Months", + day: "Day | Days", + hour: "Hour | Hours", + minute: "Minute | Minutes", failures_24_hours: "Failures last 24 hours", no_services: "You currently don't have any services!", theme: "Theme", @@ -139,4 +139,4 @@ const english = { service_create: "Create Service" } -export default english \ No newline at end of file +export default english diff --git a/frontend/src/languages/french.js b/frontend/src/languages/french.js index 4115f01c..52042165 100644 --- a/frontend/src/languages/french.js +++ b/frontend/src/languages/french.js @@ -51,11 +51,11 @@ const french = { service_offline_time: "Le service a été hors ligne pour", days_ago: "Il y a jours", today: "Aujourd'hui", - week: "Semaine", + week: "Semaine | Semaines", month: "Mois", - day: "Jour", - hour: "Heure", - minute: "Minute", + day: "Jour | Jours", + hour: "Heure | Heures", + minute: "Minute | Procès-Verbal", failures_24_hours: "Les échecs durent 24 heures", no_services: "Vous n'avez actuellement aucun service !", theme: "Thème", @@ -139,4 +139,4 @@ const french = { service_create: "Créer un service" } -export default french \ No newline at end of file +export default french diff --git a/frontend/src/languages/german.js b/frontend/src/languages/german.js index e9f80593..40c2b367 100644 --- a/frontend/src/languages/german.js +++ b/frontend/src/languages/german.js @@ -51,11 +51,11 @@ const german = { service_offline_time: "Dienst war offline für", days_ago: "Vor Tagen", today: "Heute", - week: "Woche", - month: "Monat", - day: "Tag", - hour: "Stunde", - minute: "Minute", + week: "Woche | Wochen", + month: "Monat | Monate", + day: "Tag | Tage", + hour: "Stunde | Stunden", + minute: "Minute | Minuten", failures_24_hours: "Ausfälle dauern 24 Stunden", no_services: "Sie haben derzeit keine Dienste!", theme: "Thema", @@ -139,4 +139,4 @@ const german = { service_create: "Dienst erstellen" } -export default german \ No newline at end of file +export default german diff --git a/frontend/src/languages/italian.js b/frontend/src/languages/italian.js index ccf9a417..fcdc38dd 100755 --- a/frontend/src/languages/italian.js +++ b/frontend/src/languages/italian.js @@ -51,10 +51,10 @@ const italian = { service_offline_time: "Il servizio è stato offline per", days_ago: "Giorni fa", today: "Oggi", - week: "Settimana", - month: "Mese", - day: "Giorno", - hour: "Ora", + week: "Settimana | Settimane", + month: "Mese | Mesi", + day: "Giorno | Giorni", + hour: "Ora | Ore", minute: "Minuti", failures_24_hours: "Errori nelle ultime 24 ore", no_services: "Al momento non hai alcun servizio!", @@ -139,4 +139,4 @@ const italian = { service_create: "Crea servizio" } -export default italian \ No newline at end of file +export default italian diff --git a/frontend/src/languages/japanese.js b/frontend/src/languages/japanese.js index eed5a90c..9c8fea1e 100755 --- a/frontend/src/languages/japanese.js +++ b/frontend/src/languages/japanese.js @@ -51,11 +51,11 @@ const japanese = { service_offline_time: "のサービスがオフラインになりました", days_ago: "日前", today: "今日", - week: "週数", - month: "月", - day: "日", - hour: "アワー", - minute: "分", + week: "週数 | 週", + month: "月 | ヶ月", + day: "日 | 日数", + hour: "アワー | 時間", + minute: "分 | 議事録", failures_24_hours: "過去 24 時間の障害", no_services: "現在、サービスをお持ちになりません。", theme: "テーマ", @@ -139,4 +139,4 @@ const japanese = { service_create: "サービスの作成" } -export default japanese \ No newline at end of file +export default japanese diff --git a/frontend/src/languages/korean.js b/frontend/src/languages/korean.js index 2cba872f..4edf140b 100755 --- a/frontend/src/languages/korean.js +++ b/frontend/src/languages/korean.js @@ -55,7 +55,7 @@ const korean = { month: "월", day: "일", hour: "시간", - minute: "분", + minute: "분 | 의사록", failures_24_hours: "지난 24시간 동안 장애 발생", no_services: "현재 서비스가 없습니다!", theme: "테마", @@ -139,4 +139,4 @@ const korean = { service_create: "서비스 만들기" } -export default korean \ No newline at end of file +export default korean diff --git a/frontend/src/languages/russian.js b/frontend/src/languages/russian.js index 4a578938..2b276258 100644 --- a/frontend/src/languages/russian.js +++ b/frontend/src/languages/russian.js @@ -52,10 +52,10 @@ const russian = { days_ago: "Дней назад", today: "Сегодня", week: "Недели", - month: "Месяц", - day: "День", - hour: "Час", - minute: "Минута", + month: "Месяц | Месяцы", + day: "День | Дней", + hour: "Час | Часов", + minute: "Минута | Минуты", failures_24_hours: "Сбои за 24 часа", no_services: "В настоящее время у вас нет услуг!", theme: "Тема", @@ -139,4 +139,4 @@ const russian = { service_create: "Создать службу" } -export default russian \ No newline at end of file +export default russian diff --git a/frontend/src/languages/spanish.js b/frontend/src/languages/spanish.js index ea6e4293..09ae1453 100644 --- a/frontend/src/languages/spanish.js +++ b/frontend/src/languages/spanish.js @@ -51,11 +51,11 @@ const spanish = { service_offline_time: "El servicio ha estado desconectado para", days_ago: "Hace días", today: "Hoy", - week: "Semana", - month: "Mes", - day: "Día", - hour: "Hora", - minute: "Minuto", + week: "Semana | Semanas", + month: "Mes | Meses", + day: "Día | Días", + hour: "Hora | Horas", + minute: "Minuto | Minutos", failures_24_hours: "Fallos de las últimas 24 horas", no_services: "¡Actualmente no tienes ningún servicio!", theme: "Tema", @@ -139,4 +139,4 @@ const spanish = { service_create: "Crear servicio" } -export default spanish \ No newline at end of file +export default spanish From 93a2e58ced72baa5eaa92a2217288e24c5582d2f Mon Sep 17 00:00:00 2001 From: Ashish Date: Mon, 28 Dec 2020 09:36:30 -0800 Subject: [PATCH 5/5] Fixed Minutes French translation --- frontend/src/languages/french.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/languages/french.js b/frontend/src/languages/french.js index 52042165..68b204a8 100644 --- a/frontend/src/languages/french.js +++ b/frontend/src/languages/french.js @@ -55,7 +55,7 @@ const french = { month: "Mois", day: "Jour | Jours", hour: "Heure | Heures", - minute: "Minute | Procès-Verbal", + minute: "Minute | Minutes", failures_24_hours: "Les échecs durent 24 heures", no_services: "Vous n'avez actuellement aucun service !", theme: "Thème", @@ -109,7 +109,7 @@ const french = { notify_before: "Avertir avant", message_create: "Créer une annonce", message_edit: "Modifier l'annonce", - minutes: "Procès-Verbal", + minutes: "Minutes", hours: "Heures", days: "Jours", user_create: "Créer un utilisateur",