From d1bd7441be463c6f274722a68941f338ac5983fe Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 10 Feb 2022 21:50:28 +0100
Subject: [PATCH] =?UTF-8?q?Dodano=20t=C5=82umaczenia=20do=20status=C3=B3w?=
 =?UTF-8?q?=20danych?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/App/StatusIndicator.vue   | 25 ++++++++++--------------
 src/components/TrainsView/TrainTable.vue |  2 +-
 src/locales/en.json                      |  9 +++++++++
 src/locales/pl.json                      | 10 ++++++++++
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/components/App/StatusIndicator.vue b/src/components/App/StatusIndicator.vue
index 9151c65..f7d6e97 100644
--- a/src/components/App/StatusIndicator.vue
+++ b/src/components/App/StatusIndicator.vue
@@ -155,13 +155,8 @@
       </svg>
 
       <transition name="tooltip-anim">
-        <div class="indicator-tooltip" v-if="tooltipActive">
-          <b
-            >Sygnał
-            {{ indicator.status <= 0 ? 'S3' : indicator.status == 1 ? 'S1a' : indicator.status == 2 ? 'S2' : 'S5' }}</b
-          >
-          <br />
-          {{ indicator.message }}
+        <div v-html="$t(indicator.message)" class="indicator-tooltip" v-if="tooltipActive">
+          
         </div>
       </transition>
     </div>
@@ -184,7 +179,7 @@ export default defineComponent({
       tooltipActive: false,
       indicator: {
         status: DataStatus.Loading,
-        message: 'Ładowanie danych...',
+        message: 'data-status.S3',
       },
 
       greenLight: false,
@@ -210,49 +205,49 @@ export default defineComponent({
       if (dataConnectionStatus == DataStatus.Error) {
         this.setSignalStatus(dataConnectionStatus);
         this.indicator.status = dataConnectionStatus;
-        this.indicator.message = 'Błąd podczas łączenia z serwisem SWDR!';
+        this.indicator.message = 'data-status.S1a-connection';
         return;
       }
 
       if (sceneryDataStatus == DataStatus.Error) {
         this.setSignalStatus(sceneryDataStatus);
         this.indicator.status = sceneryDataStatus;
-        this.indicator.message = 'Nie można pobrać danych o sceneriach!';
+        this.indicator.message = 'data-status.S1a-sceneries';
         return;
       }
 
       if (trainsDataStatus == DataStatus.Warning) {
         this.setSignalStatus(trainsDataStatus);
         this.indicator.status = trainsDataStatus;
-        this.indicator.message = 'Nie można pobrać danych o pociągach!';
+        this.indicator.message = 'data-status.S5-trains';
         return;
       }
 
       if (dispatcherDataStatus == DataStatus.Warning) {
         this.setSignalStatus(dispatcherDataStatus);
         this.indicator.status = dispatcherDataStatus;
-        this.indicator.message = 'Nie można pobrać danych o statusach dyżurnych ruchu!';
+        this.indicator.message = 'data-status.S5-dispatchers';
         return;
       }
 
       if (timetableDataStatus == DataStatus.Warning) {
         this.setSignalStatus(timetableDataStatus);
         this.indicator.status = timetableDataStatus;
-        this.indicator.message = 'Rozkłady jazdy mogą być niekompletne!';
+        this.indicator.message = 'data-status.S5-timetables';
         return;
       }
 
       if (timetableDataStatus == DataStatus.Loading) {
         this.setSignalStatus(timetableDataStatus);
         this.indicator.status = timetableDataStatus;
-        this.indicator.message = 'Ładowanie rozkładów jazdy...';
+        this.indicator.message = 'data-status.S3';
         return;
       }
 
       this.setSignalStatus(DataStatus.Loaded);
 
       this.indicator.status = DataStatus.Loaded;
-      this.indicator.message = 'Dane załadowane poprawnie!';
+      this.indicator.message = 'data-status.S2';
     },
   },
 
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index af5a61e..c75512c 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -6,7 +6,7 @@
           {{ $t('trains.distance-exceeded') }}
         </div>
 
-        <div class="table-info no-trains" v-if="trains.length == 0 && trainsDataStatus == 2">
+        <div class="table-info no-trains" v-if="trains.length == 0 && trainsDataStatus >= 2">
           {{ $t('trains.no-trains') }}
         </div>
 
diff --git a/src/locales/en.json b/src/locales/en.json
index bad7ee8..ae14f15 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -7,6 +7,15 @@
     "support": "Support the project",
     "error": "An error occured while loading data!",
     "no-result": "No results for current search!"
+  },
+   "data-status": {
+    "S1a-connection": "<b>S1a signal</b> <br> Cannot connect with SWDR API service!",
+    "S1a-sceneries": "<b>S1a signal</b> <br> Cannot load online stations data!",
+    "S2": "<b>S2 signal</b> <br> All data loaded successfully!",
+    "S3": "<b>S3 signal</b> <br> Loading data...",
+    "S5-timetables": "<b>S5 signal</b> <br> Timetables might be incorrect or missing!",
+    "S5-dispatchers": "<b>S5 signal</b> <br> Cannot load dispatchers status data!",
+    "S5-trains": "<b>S5 signal</b> <br> Cannot load online trains data!"
   },
   "desc": {
     "control-type": "Control type: ",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 410af4c..3e3566b 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -8,6 +8,16 @@
     "error": "Wystąpił problem z załadowaniem danych!",
     "no-result": "Brak wyników o podanych kryteriach!"
   },
+
+   "data-status": {
+    "S1a-connection": "<b>Sygnał S1a</b> <br> Błąd podczas próby połączenia się z serwisem SWDR!",
+    "S1a-sceneries": "<b>Sygnał S1a</b> <br> Błąd podczas pobierania danych o sceneriach online!",
+    "S2": "<b>Sygnał S2</b> <br> Pomyślnie załadowano dane!",
+    "S3": "<b>Sygnał S3</b> <br> Pobieranie danych...",
+    "S5-timetables": "<b>Sygnał S5</b> <br> Rozkłady jazdy mogą być niekompletne!",
+    "S5-dispatchers": "<b>Sygnał S5</b> <br> Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
+    "S5-trains": "<b>Sygnał S5</b>  <br> Błąd podczas pobierania danych o pociągach online!"
+  },
   "desc": {
     "control-type": "Sterowanie: ",
     "signals-type": "Sygnalizacja: ",