Merge branch 'feature/lastUptime' of https://github.com/thatInfrastructureGuy/statping into thatInfrastructureGuy-feature/lastUptime

frontend/src/components/Service/ServiceTopStats.vue

@@ -6,11 +6,11 @@
         </div>
         <div class="col-4">
             <span class="font-5 d-block font-weight-bold">{{service.online_24_hours}} %</span>
-            <span class="font-1 subtitle">{{$t('last_uptime', [24, $tc('hour', 24)])}}</span>
+            <span class="font-1 subtitle">{{$t('last_uptime')}} 24 {{$tc('hour', 24)}}</span>
         </div>
         <div class="col-4">
             <span class="font-5 d-block font-weight-bold">{{service.online_7_days}} %</span>
-            <span class="font-1 subtitle">{{$t('last_uptime', [7, $tc('day', 7)])}}</span>
+            <span class="font-1 subtitle">{{$t('last_uptime')}} 7 {{$tc('day', 7)}}</span>
         </div>
     </div>
 </template>

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
+export default chinese

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
+export default english

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 | 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",
@@ -139,4 +139,4 @@ const french = {
     service_create: "Créer un service"
 }
 
-export default french
+export default french

frontend/src/languages/german.js

@@ -51,11 +51,11 @@ const german = {
     service_offline_time: "Dienst war offline für",
     days_ago: "Tage vergangen",
     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 letzte 24 Stunden",
     no_services: "Sie haben derzeit keine Dienste!",
     theme: "Thema",

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
+export default italian

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
+export default japanese

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
+export default korean

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
+export default russian

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
+export default spanish