From c7447d3655a9f6f22bd37ca33bd9a0d8b9a79ae0 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 10 Jan 2022 03:55:55 +0100
Subject: [PATCH] =?UTF-8?q?Poprawki=20wygl=C4=85du?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SceneryView/SceneryHistory.vue | 19 ++++++++++---------
 src/locales/en.json                           | 11 ++++++-----
 src/locales/pl.json                           | 11 ++++++-----
 src/views/SceneryView.vue                     |  6 +++---
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/components/SceneryView/SceneryHistory.vue b/src/components/SceneryView/SceneryHistory.vue
index 005dd37..f513adb 100644
--- a/src/components/SceneryView/SceneryHistory.vue
+++ b/src/components/SceneryView/SceneryHistory.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="scenery-history">
-    <h2>HISTORIA DYŻURÓW</h2>
+    <h2>{{ $t('journal.title') }}</h2>
 
     <ul>
       <li v-if="!isLoaded">
-        <h3>Ładowanie historii...</h3>
+        <h3>{{ $t('journal.loading') }}</h3>
       </li>
 
       <li v-if="isLoaded && dispatcherTimeline.length == 0">
-        <h3>Brak historii dla tej scenerii!</h3>
+        <h3>{{ $t('journal.no-history') }}</h3>
       </li>
 
       <li v-for="(timeline, i) in dispatcherTimeline" :key="i">
@@ -98,9 +98,9 @@ export default defineComponent({
   async mounted() {
     try {
       const apiResult: HistoryResultAPI = (await axios.get(`${API_URL}?name=${this.name}`)).data;
-      
+
       this.isLoaded = true;
-      if(!apiResult || !apiResult.result) return;
+      if (!apiResult || !apiResult.result) return;
 
       if (!apiResult.errorMessage) {
         this.dispatcherHistory = apiResult.result.dispatcherHistory;
@@ -122,7 +122,6 @@ export default defineComponent({
             return acc;
           }, [] as DispatcherTimeline[])
           .reverse();
-
       }
     } catch (error) {
       console.error(error);
@@ -148,12 +147,14 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .scenery-history {
-    height: 600px;
-    overflow-y: scroll;
+  height: 600px;
+  overflow-y: hidden;
 }
 
 ul {
-  margin-top: 1em;
+  margin-top: 2em;
+  height: 600px;
+  overflow-y: scroll;
 }
 
 li {
diff --git a/src/locales/en.json b/src/locales/en.json
index 4ff9849..f4903f1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -139,10 +139,9 @@
     "table-limit": "For performance reasons there's a limit of 10 trains shown at the same time." 
   },
   "journal": {
-    "title": "SCENERY ACTIVITY JOURNAL",
-    "subtitle": "Shows all recent dispatchers on a selected scenery",
-    "disclaimer": "<b>This functionality is unfinished!</b> \n Information shown here could be false or incorrect!",
-    "select": "Select a scenery"
+    "title": "DISPATCHER HISTORY",
+    "loading": "Loading dispatcher history data...",
+    "no-history": "No dispatcher history found!"
   },
   "scenery": {
     "users": "PLAYERS ONLINE",
@@ -152,7 +151,9 @@
     "no-users": "NO ACTIVE PLAYERS",
     "no-spawns": "NO OPEN SPAWNS",
     "no-scenery": "Oops! This scenery doesn't exist!",
-    "return-btn": "Return to main site"
+    "return-btn": "Return to main site",
+    "history-btn": "View the dispatcher history",
+    "info-btn": "Return to the scenery view"
   },
   "timetables": {
     "timetable-only": "Switch to timetable-only view",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index a5c97c6..9bb0316 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -139,10 +139,9 @@
     "table-limit": "Dla płynności działania strony pokazanych jest tylko 10 pociągów zgodnie z wybranymi filtrami." 
   },
   "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> \n Informacje pokazywane na ekranie mogą znikać, a ich zawartość może być fałszywa!",
-    "select": "Wybierz scenerię"
+    "title": "HISTORIA DYŻURÓW",
+    "loading": "Ładowanie historii dyżurów...",
+    "no-history": "Brak historii dyżurów dla tej scenerii!"
   },
   "scenery": {
     "users": "GRACZE ONLINE",
@@ -152,7 +151,9 @@
     "no-users": "BRAK AKTYWNYCH GRACZY",
     "no-spawns": "BRAK OTWARTYCH SPAWNÓW",
     "no-scenery": "Ups! Ta sceneria nie istnieje!",
-    "return-btn": "Wróć na stronę główną"
+    "return-btn": "Wróć na stronę główną",
+    "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
+    "info-btn": "Wróc do widoku scenerii"
   },
   "timetables": {
     "timetable-only": "Wyodrębnij rozkłady jazdy",
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index b637ff8..1ca8f72 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -9,7 +9,7 @@
     </div>
 
     <div class="scenery-wrapper" v-if="stationInfo" ref="card-wrapper">
-      <button v-if="!timetableOnly" class="back-btn btn btn--image" title="Powrót do scenerii" @click="navigateTo('/')">
+      <button v-if="!timetableOnly" class="back-btn btn btn--image" :title="$t('scenery.return-btn')" @click="navigateTo('/')">
         <img :src="icons.back" alt="Back to scenery" />
       </button>
 
@@ -17,9 +17,9 @@
         v-if="!timetableOnly"
         class="history-btn btn btn--image"
         @click="setCardViewMode(viewMode == 'history' ? 'info' : 'history')"
-        :title="viewMode == 'history' ? 'Powrót do widoku scenerii' : 'Widok historii dyżurnych ruchu'"
+        :title="viewMode == 'history' ? $t('scenery.info-btn') : $t('scenery.history-btn')"
       >
-        <img :src="viewMode == 'history' ? icons.history : icons.user" alt="icon" />
+        <img :src="viewMode == 'history' ? icons.user : icons.history" alt="icon" />
       </button>
 
       <SceneryHeader :station="stationInfo" />