From b48f7a58dce9b2b408e41da8dfd76cfccbab2295 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 29 Jun 2021 16:24:50 +0200
Subject: [PATCH] =?UTF-8?q?Wy=C5=9Bwietlanie=20liczby=20wagon=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrainsView/TrainTable.vue | 32 ++++++++++++++----------
 src/locales/en.json                      |  6 ++++-
 src/locales/pl.json                      |  6 ++++-
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 7b37f13..a45c245 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -219,6 +219,10 @@
             </div>
 
             <span class="driver-loco">
+              <div class="driver-cars">
+                <span v-if="train.cars.length > 0">{{ $t("trains.cars") }}: <span class="count">{{ train.cars.length }}</span></span>
+                <span v-else>{{ displayLocoInfo(train.locoType) }}</span>
+              </div>
               <img
                 class="train-image"
                 :src="train.locoURL"
@@ -226,12 +230,6 @@
               />
             </span>
 
-            <div
-              class="driver-cars"
-              v-html="calculateCars(train.locoType, train.cars) "
-            >
-
-            </div>
           </span>
 
           <span class="stats">
@@ -454,13 +452,13 @@ export default defineComponent({
         .join(" > ");
     },
 
-    calculateCars(locoType: string, cars: string[]) {
-      if (cars.length == 0 && locoType.includes("EN")) return "EZT";
-      else if (cars.length == 0) return "LOK";
+    displayLocoInfo(locoType: string) {
+      if (locoType.includes("EN")) return `${this.$t("trains.EZT")}`;
+      if (locoType.includes("SN")) return `${this.$t("trains.SZT")}`;
+      if (locoType.startsWith("E")) return `${this.$t("trains.loco-electric")}`;
+      if (locoType.startsWith("S")) return `${this.$t("trains.loco-diesel")}`;
 
-      return `${this.$t("trains.cars")}: <span style='color:gold'> ${
-        cars.length
-      }</span>`;
+      return "";
     },
   },
 
@@ -611,7 +609,15 @@ img.train-image {
   }
 
   &-cars {
-    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    white-space: pre-wrap;
+    text-align: center;
+
+    color: #c5c5c5;
+
+    .count {
+      color: var(--clr-primary);
+    }
   }
 }
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 35b3e28..c6e251b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -110,7 +110,11 @@
     "via-title": "Via: ",
     "no-timetable": "no current timetable",
     "distance-exceeded": "Attention! Due to an internal error, timetables with route distance greater than 200km might be incorrect!",
-    "cars": "Cars"
+    "cars": "Car count",
+    "EZT": "EMU",
+    "SZT": "DMU",
+    "loco-electric": "ELECTRIC LOCO",
+    "loco-diesel": "DIESEL LOCO"
   },
   "journal": {
     "title": "SCENERY ACTIVITY JOURNAL",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 4285c12..ae82aed 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -110,7 +110,11 @@
     "via-title": "Przez: ",
     "no-timetable": "brak rozkładu jazdy",
     "distance-exceeded": "Uwaga! Z powodu wewnętrznego błędu serwera TD2, rozkłady jazdy o kilometrażu powyżej 200km mogą być niepoprawne!",
-    "cars": "Wagony"
+    "cars": "Wagony",
+    "EZT": "EZT",
+    "SZT": "SZT",
+    "loco-electric": "Lok. elektryczna",
+    "loco-diesel": "Lok. spalinowa"
   },
   "journal": {
     "title": "DZIENNIK AKTYWNOŚCI SCENERII",