From 2c604285993db578a11c37dca1ca275659461822 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 7 Mar 2021 02:08:59 +0100
Subject: [PATCH] =?UTF-8?q?Aktualizacja=20t=C5=82umacze=C5=84=20EN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 src/components/SceneryView/SceneryInfo.vue    | 16 +++----
 .../SceneryView/SceneryTimetable.vue          | 22 ++++-----
 src/components/StationsView/FilterCard.vue    |  2 +-
 src/components/StationsView/StationTable.vue  | 45 ++-----------------
 src/components/TrainsView/TrainSchedule.vue   | 11 -----
 src/components/TrainsView/TrainTable.vue      |  6 +--
 src/lang/en.json                              | 35 ++++++++++++++-
 src/lang/pl.json                              | 35 ++++++++++++++-
 src/scripts/interfaces/Station.ts             |  3 +-
 src/scripts/stationFilterManager.ts           |  2 +-
 src/store/store.ts                            | 37 +++++++++++++--
 src/views/HistoryView.vue                     | 16 ++-----
 src/views/SceneryView.vue                     |  8 ++--
 src/views/StationsView.vue                    |  4 +-
 15 files changed, 139 insertions(+), 105 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6a0a1af..31b4dec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -80,7 +80,7 @@ export default class App extends Vue {
   @Action("synchronizeData") synchronizeData;
   @Getter("getAllData") data;
 
-  private VERSION = "1.4.1";
+  private VERSION = "1.4.2";
 
   hasReleaseNotes = false;
   updateModalVisible = false;
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 9e84dd0..5ba9f2e 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -117,17 +117,15 @@
           <span class="name">{{ stationInfo.dispatcherName }}</span>
         </div>
 
-        <span
-          class="status-badge"
-          :class="statusClasses(stationInfo.occupiedTo)"
-          >{{ stationInfo.occupiedTo }}
-        </span>
+        <span class="status-badge" :class="stationInfo.statusID">{{
+          $t(`status.${stationInfo.statusID}`)
+        }}</span>
       </div>
 
       <div class="info-lists">
         <div class="user-list">
           <h3 class="user-header">
-            GRACZE ONLINE
+            {{ $t("scenery.users") }}
             <img :src="userIcon" alt="icon-user" />
           </h3>
 
@@ -146,13 +144,13 @@
             class="user offline"
             v-if="!computedStationTrains || computedStationTrains.length == 0"
           >
-            BRAK AKTYWNYCH GRACZY
+            {{ $t("scenery.no-users") }}
           </div>
         </div>
 
         <div class="spawn-list">
           <h3 class="spawn-header">
-            OTWARTE SPAWNY
+            {{ $t("scenery.spawns") }}
             <img :src="spawnIcon" alt="icon-spawn" />
           </h3>
 
@@ -168,7 +166,7 @@
           <span
             class="spawn none"
             v-if="!stationInfo.spawns || stationInfo.spawns.length == 0"
-            >BRAK OTWARTYCH SPAWNÓW</span
+            >{{ $t("scenery.no-spawns") }}</span
           >
         </div>
       </div>
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index fdb39b4..b3397b8 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="scenery-timetable">
     <h3 class="timetable-header">
-      <span>AKTYWNE ROZKŁADY JAZDY</span>
+      <span>{{ $t("scenery.timetables") }}</span>
 
       <a
         v-if="!timetableOnly"
@@ -37,15 +37,16 @@
       </div>
     </div>
 
-    <span class="timetable-item loading" v-if="dataStatus == 0"
-      >Ładowanie...</span
-    >
+    <span class="timetable-item loading" v-if="dataStatus == 0">{{
+      $t("app.loading")
+    }}</span>
 
     <span
       class="timetable-item empty"
       v-else-if="computedScheduledTrains.length == 0"
-      >Brak aktywnych rozkładów!</span
     >
+      {{ $t("scenery.no-timetables") }}
+    </span>
 
     <transition-group name="list-anim">
       <div
@@ -66,8 +67,9 @@
               <span>
                 <strong>{{ scheduledTrain.category }}</strong>
                 {{ scheduledTrain.trainNo }}
-              </span> </router-link
-            >|
+              </span>
+            </router-link>
+            |
             <span>
               <a
                 :href="
@@ -87,9 +89,9 @@
           </span>
 
           <span class="general-status">
-            <span :class="scheduledTrain.stopStatus">{{
-              scheduledTrain.stopLabel
-            }}</span>
+            <span :class="scheduledTrain.stopStatus"
+              >{{ $t(`timetables.${scheduledTrain.stopStatus}`) }}
+            </span>
           </span>
         </span>
 
diff --git a/src/components/StationsView/FilterCard.vue b/src/components/StationsView/FilterCard.vue
index b6dd17c..de43a42 100644
--- a/src/components/StationsView/FilterCard.vue
+++ b/src/components/StationsView/FilterCard.vue
@@ -4,7 +4,7 @@
       <!-- <img :src="require('@/assets/icon-exit.svg')" alt="exit icon" /> -->
     </div>
 
-    <div class="card-title flex">FILTRUJ STACJE</div>
+    <div class="card-title flex">{{ $t("filters.title") }}</div>
 
     <div class="card-options">
       <div class="option" v-for="(option, i) in inputs.options" :key="i">
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 0d6d0b2..c8c85d7 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -4,17 +4,6 @@
       <table>
         <thead>
           <tr>
-            <!-- <th v-html="$t('sceneries.station')"></th>
-            <th v-html="$t('sceneries.min-lvl')"></th>
-            <th v-html="$t('sceneries.status')"></th>
-            <th v-html="$t('sceneries.dispatcher')"></th>
-            <th v-html="$t('sceneries.dispatcher-lvl')"></th>
-            <th v-html="$t('sceneries.routes')"></th>
-            <th v-html="$t('sceneries.general')"></th>
-            <th v-html="$t('sceneries.drivers-online')"></th>
-            <th v-html="$t('sceneries.spawns')"></th>
-            <th v-html="$t('sceneries.timetables')"></th> -->
-
             <th
               v-for="(id, i) in headIds"
               :key="id"
@@ -52,32 +41,6 @@
                 />
               </span>
             </th>
-
-            <!-- <th
-              v-for="(head, i) in headTitles"
-              :key="i"
-              @click="() => changeSorter(i)"
-            >
-              <span class="header_wrapper">
-                <div class="header_item">
-                  <div v-if="head[0].includes('.svg')">
-                    <img :src="head[0]" alt="test" :title="head[1]" />
-                  </div>
-
-                  <div v-else>
-                    <div>{{ head[0] }}</div>
-                    <div v-if="head.length > 1">{{ head[1] }}</div>
-                  </div>
-                </div>
-
-                <img
-                  class="sort-icon"
-                  v-if="sorterActive.index == i"
-                  :src="sorterActive.dir == 1 ? ascIcon : descIcon"
-                  alt
-                />
-              </span>
-            </th> -->
           </tr>
         </thead>
 
@@ -117,11 +80,9 @@
             </td>
 
             <td class="station_status">
-              <span
-                class="status-badge"
-                :class="statusClasses(station.occupiedTo)"
-                >{{ station.occupiedTo }}</span
-              >
+              <span class="status-badge" :class="station.statusID">{{
+                $t(`status.${station.statusID}`)
+              }}</span>
             </td>
 
             <td class="station_dispatcher-name">
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index 1355279..df8388f 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -12,17 +12,6 @@
             delayed: stop.departureDelay > 0,
           }"
         >
-          <!-- <div class="progress-bar"></div> -->
-          <!-- 
-          <div
-            class="stop-line"
-            v-if="
-              i > 0 && followingStops[i - 1].departureLine != stop.arrivalLine
-            "
-          >
-            {{ stop.arrivalLine }}
-          </div> -->
-
           <span class="stop_info">
             <div class="indicator"></div>
 
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 2ef97a8..9d49e77 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="train-table">
     <div class="no-trains" v-if="computedTrains.length == 0">
-      Ups! Brak pociągów do wyświetlenia :/
+      {{ $t("trains.no-trains") }}
     </div>
 
     <ul class="train-list">
@@ -50,7 +50,7 @@
                   <span>SRJP</span>
 
                   <span class="tooltip-text">
-                    Szczegółowy rozkład jazdy pociągu {{ train.trainNo }}
+                    {{ $t("trains.detailed-timetable") }} {{ train.trainNo }}
                   </span>
                 </div>
               </div>
@@ -65,7 +65,7 @@
 
               <div class="info-stops">
                 <span v-if="train.timetableData.followingStops.length > 2">
-                  Przez:
+                  {{ $t("trains.via-title") }}
 
                   <span
                     v-html="
diff --git a/src/lang/en.json b/src/lang/en.json
index 08ebfba..bbbb463 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -2,7 +2,18 @@
   "app": {
     "sceneries": "SCENERIES",
     "trains": "TRAINS",
-    "journal": "JOURNAL"
+    "journal": "JOURNAL",
+    "loading": "Loading data..."
+  },
+  "descs": {},
+  "status": {
+    "free": "FREE",
+    "ending": "ENDING",
+    "not-signed": "NOT SIGNED IN",
+    "no-limit": "NO LIMIT",
+    "unavailable": "UNAVAILABLE",
+    "brb": "AFK",
+    "no-space": "NO SPACE"
   },
   "options": {
     "filters": "FILTERS",
@@ -48,6 +59,7 @@
     "timetables": "Active timetables"
   },
   "trains": {
+    "no-trains": "Oops! No trains online!",
     "stats": "TRAFFIC STATISTICS",
     "stats-speed": "TRAINS SPEED (MIN | AVG | MAX) [km/h]",
     "stats-length": "TIMETABLES LENGTH (MIN | AVG | MAX) [km]",
@@ -62,12 +74,31 @@
     "option-timetable": "train no.",
     "search-no": "Search for train no...",
     "search-driver": "Search for driver...",
-    "detailed-timetable": "Detailed timetable for train no. "
+    "detailed-timetable": "Detailed timetable for train no. ",
+    "via-title": "Via: "
   },
   "journal": {
     "title": "SCENERY ACTIVITY JOURNAL",
     "subtitle": "Shows all recent dispatchers on a selected scenery",
     "disclaimer": "<b>This functionality is unfinished!</b> <br> Information shown here could be false or incorrect!",
     "select": "Select a scenery"
+  },
+  "scenery": {
+    "users": "PLAYERS ONLINE",
+    "spawns": "OPEN SPAWNS",
+    "timetables": "ACTIVE TIMETABLES",
+    "no-timetables": "No active timetables!",
+    "no-users": "NO ACTIVE PLAYERS",
+    "no-spawns": "NO OPEN SPAWNS",
+    "no-scenery": "Oops! This scenery doesn't exist or is offline!",
+    "return-btn": "Return to main site"
+  },
+  "timetables": {
+    "online": "At station",
+    "departed": "Dispatched",
+    "departed-away": "Departed",
+    "arriving": "En route",
+    "stopped": "Stopped",
+    "terminated": "Terminated"
   }
 }
diff --git a/src/lang/pl.json b/src/lang/pl.json
index 597d39f..7f2d696 100644
--- a/src/lang/pl.json
+++ b/src/lang/pl.json
@@ -2,7 +2,18 @@
   "app": {
     "sceneries": "SCENERIE",
     "trains": "POCIĄGI",
-    "journal": "DZIENNIK"
+    "journal": "DZIENNIK",
+    "loading": "Pobieranie danych..."
+  },
+  "descs": {},
+  "status": {
+    "free": "WOLNA",
+    "ending": "KOŃCZY",
+    "not-signed": "NIEZALOGOWANY",
+    "no-limit": "BEZ LIMITU",
+    "unavailable": "NIEDOSTĘPNY",
+    "brb": "Z/W",
+    "no-space": "BRAK MIEJSCA"
   },
   "options": {
     "filters": "FILTRY",
@@ -48,6 +59,7 @@
     "timetables": "Aktywne rozkłady jazdy"
   },
   "trains": {
+    "no-trains": "Ups! Brak pociągów online!",
     "stats": "STATYSTYKI RUCHU",
     "stats-speed": "PRĘDKOŚCI POCIĄGÓW (MIN | ŚR | MAX) [km/h]",
     "stats-length": "DŁUGOŚCI ROZKŁADÓW (MIN | ŚR | MAX) [km]",
@@ -62,12 +74,31 @@
     "option-timetable": "numer pociagu",
     "search-no": "Szukaj nr pociągu...",
     "search-driver": "Szukaj maszynisty...",
-    "detailed-timetable": "Szczegółowy rozkład jazdy pociągu "
+    "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
+    "via-title": "Przez: "
   },
   "journal": {
     "title": "DZIENNIK AKTYWNOŚCI SCENERII",
     "subtitle": "Pokazuje dyżurnych, którzy ostatnio byli aktywni na wybranej scenerii",
     "disclaimer": "<b>Ta funkcjonalność jest w testach beta!</b> <br> Informacje pokazywane na ekranie mogą znikać, a ich zawartość może być fałszywa!",
     "select": "Wybierz scenerię"
+  },
+  "scenery": {
+    "users": "GRACZE ONLINE",
+    "spawns": "OTWARTE SPAWNY",
+    "timetables": "AKTYWNE ROZKŁADY JAZDY",
+    "no-timetables": "Brak aktywnych rozkładów!",
+    "no-users": "BRAK AKTYWNYCH GRACZY",
+    "no-spawns": "BRAK OTWARTYCH SPAWNÓW",
+    "no-scenery": "Ups! Nie znaleziono danej stacji bądź jest ona offline!",
+    "return-btn": "Wróć na stronę główną"
+  },
+  "timetables": {
+    "online": "Na stacji",
+    "departed": "Odprawiony",
+    "departed-away": "Odjechał",
+    "arriving": "W drodze",
+    "stopped": "Postój",
+    "terminated": "Skończył bieg"
   }
 }
diff --git a/src/scripts/interfaces/Station.ts b/src/scripts/interfaces/Station.ts
index 5019aa7..b2cd5e0 100644
--- a/src/scripts/interfaces/Station.ts
+++ b/src/scripts/interfaces/Station.ts
@@ -47,8 +47,9 @@ export default interface Station {
   stops: string[] | null;
 
   online: boolean;
-  occupiedTo: string;
+  // occupiedTo: string;
   statusTimestamp: number;
+  statusID: string;
 
   stationTrains: Train[];
   scheduledTrains: ScheduledTrain[];
diff --git a/src/scripts/stationFilterManager.ts b/src/scripts/stationFilterManager.ts
index 60220c0..96a4510 100644
--- a/src/scripts/stationFilterManager.ts
+++ b/src/scripts/stationFilterManager.ts
@@ -36,7 +36,7 @@ export default class StationFilterManager {
       .filter(station => {
         if ((station.nonPublic || !station.reqLevel) && this.filters['nonPublic']) return false;
 
-        if (station.online && station.occupiedTo == 'KOŃCZY' && this.filters['ending']) return false;
+        if (station.online && station.statusID == 'ending' && this.filters['ending']) return false;
 
         if (station.online && this.filters['occupied']) return false;
         if (!station.online && this.filters['free']) return false;
diff --git a/src/store/store.ts b/src/store/store.ts
index 8207f86..6a7f2a3 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -39,6 +39,35 @@ const URLs = {
 const timetableURL = (trainNo: number) => `https://api.td2.info.pl:9640/?method=readFromSWDR&value=getTimetable%3B${trainNo}%3Beu`;
 const getLocoURL = (locoType: string) => `https://rj.td2.info.pl/dist/img/thumbnails/${locoType.includes('EN') ? locoType + 'rb' : locoType}.png`;
 
+const getStatusID = (stationStatus: any) => {
+  if (!stationStatus) return 'not-signed';
+
+  const statusCode = stationStatus[2];
+  const statusTimestamp = stationStatus[3];
+
+  switch (statusCode) {
+    case 0:
+      if (statusTimestamp - Date.now() > 21000000) return 'no-limit';
+
+      return 'online';
+
+    case 1:
+      return 'brb';
+
+    case 2:
+      if (statusTimestamp == 0) return 'ending';
+      break;
+
+    case 3:
+      return 'no-space';
+
+    default:
+      break;
+  }
+
+  return 'unavailable';
+};
+
 const getStatusLabel = (stationStatus: any) => {
   if (!stationStatus) return 'NIEZALOGOWANY';
 
@@ -265,8 +294,8 @@ export default class Store extends VuexModule {
 
           const stationStatus = onlineDispatchersData.find(status => status[0] == station.stationHash && status[1] == 'eu');
 
-          const statusLabel = getStatusLabel(stationStatus);
           const statusTimestamp = getStatusTimestamp(stationStatus);
+          const statusID = getStatusID(stationStatus);
 
           const stationTrains = onlineTrainsData.filter(
             train => train.region === 'eu' && train.isOnline && train.station.stationName === station.stationName
@@ -283,9 +312,9 @@ export default class Store extends VuexModule {
             dispatcherId: station.dispatcherId,
             dispatcherExp: station.dispatcherExp,
             dispatcherIsSupporter: station.dispatcherIsSupporter,
-            occupiedTo: statusLabel,
             stationTrains,
             statusTimestamp,
+            statusID,
           });
 
           return acc;
@@ -398,8 +427,8 @@ export default class Store extends VuexModule {
       dispatcherId: 0,
       dispatcherIsSupporter: false,
       online: false,
-      occupiedTo: 'WOLNA',
       statusTimestamp: -3,
+      statusID: 'free',
       stationTrains: [],
       scheduledTrains: [],
       spawns: [],
@@ -479,7 +508,7 @@ export default class Store extends VuexModule {
           dispatcherId: 0,
           dispatcherIsSupporter: false,
           online: false,
-          occupiedTo: 'WOLNA',
+          statusID: 'free',
           statusTimestamp: -3,
           stationTrains: [],
           scheduledTrains: [],
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index c040db8..b64f164 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -2,9 +2,9 @@
   <div class="history_view">
     <div class="history_wrapper">
       <div class="header">
-        <h2>DZIENNIK AKTYWNOŚCI SCENERII</h2>
+        <h2>{{ $t("journal.title") }}</h2>
         <p style="color: #ccc">
-          Pokazuje dyżurnych, którzy ostatnio byli aktywni na wybranej scenerii
+          {{ $t("journal.subtitle") }}
         </p>
 
         <div class="search-box">
@@ -12,9 +12,7 @@
             <label :class="{ disabled: dataLoading }">
               <select v-model="inputStationName" :disabled="dataLoading">
                 <option value disabled selected hidden>
-                  {{
-                    dataLoading ? "Pobieranie danych..." : "Wybierz scenerię"
-                  }}
+                  {{ dataLoading ? $t("app.loading") : $t("journal.select") }}
                 </option>
                 <option
                   v-for="station in filteredStationList"
@@ -28,13 +26,7 @@
           </div>
         </div>
 
-        <div class="disclaimer">
-          <h4>Ta funkcjonalność jest w testach beta!</h4>
-          <p>
-            Informacje pokazywane na ekranie mogą znikać, a ich zawartość może
-            być fałszywa!
-          </p>
-        </div>
+        <div class="disclaimer" v-html="$t('journal.disclaimer')"></div>
       </div>
 
       <div class="list">
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index 68c0e04..b2ef340 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -4,9 +4,9 @@
       class="scenery-offline"
       v-if="!stationInfo && dataStatus == 2 && currentPath === '/scenery'"
     >
-      Ups! Nie znaleziono danej stacji bądź jest ona offline!
+      {{ $t("scenery.no-scenery") }}
       <button class="button">
-        <router-link to="/">Wróć na stronę główną</router-link>
+        <router-link to="/">{{ $t("scenery.return-btn") }}</router-link>
       </button>
     </div>
 
@@ -109,9 +109,9 @@ h3 {
 
   &-offline {
     align-self: center;
-    font-size: 2em;
+    font-size: 1.5em;
     text-align: center;
-    padding: 0 1em;
+    padding: 2em 1em;
 
     color: $warningCol;
 
diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue
index 9e5adae..dcb3f32 100644
--- a/src/views/StationsView.vue
+++ b/src/views/StationsView.vue
@@ -18,11 +18,11 @@
               <p>{{ $t("options.filters") }}</p>
             </button>
 
-            <button class="action-btn" @click="toggleModal">
+            <!-- <button class="action-btn" @click="toggleModal">
               <img :src="dolarIcon" alt="icon-dolar" />
 
               <p>{{ $t("options.donate") }}</p>
-            </button>
+            </button> -->
           </div>
 
           <div class="bar_indicators">