From 475bd2ff1028b84848552ec6d358c32bbe613e2d Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 13 Apr 2023 19:11:44 +0200
Subject: [PATCH] =?UTF-8?q?przeniesienie=20skr=C3=B3t=C3=B3w=20do=20widoku?=
 =?UTF-8?q?=20scenerii?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SceneryView/SceneryHeader.vue | 12 +++++++++---
 src/components/SceneryView/SceneryInfo.vue   |  3 ++-
 src/components/StationsView/StationTable.vue |  4 ----
 src/locales/en.json                          |  5 +++--
 src/locales/pl.json                          |  4 +++-
 src/scripts/data/stationHeaderNames.ts       |  1 -
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue
index ab40750..58d11b0 100644
--- a/src/components/SceneryView/SceneryHeader.vue
+++ b/src/components/SceneryView/SceneryHeader.vue
@@ -4,6 +4,8 @@
       {{ station.name }}
     </a>
 
+    <div class="scenery-abbrev">{{ $t('scenery.abbrev') }} <b>{{ station.generalInfo?.abbr }}</b></div>
+
     <div class="scenery-hash" v-if="station.onlineInfo?.hash">#{{ station.onlineInfo.hash }}</div>
   </section>
 </template>
@@ -28,16 +30,20 @@ export default defineComponent({
 
 .scenery-name {
   font-weight: bold;
-
-  position: relative;
-
   font-size: 3em;
 
   text-transform: uppercase;
 }
 
+.scenery-abbrev {
+  font-size: 1.3em;
+  color: #aaa;
+}
+
 .scenery-hash {
+  margin-top: 0.5em;
   color: #aaa;
   font-size: 1.2em;
 }
 </style>
+
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 82a9dc4..1e62113 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -30,8 +30,9 @@
               style="color: salmon; text-decoration: underline; font-weight: bold"
               :href="station.generalInfo.projectUrl"
               target="_blank"
-              >{{ station.generalInfo.project }}</a
             >
+              {{ station.generalInfo.project }}
+            </a>
           </span>
         </div>
 
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 360483f..c7bf08d 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -53,10 +53,6 @@
               {{ station.name }}
             </td>
 
-            <td>
-              {{ station.generalInfo?.abbr }}
-            </td>
-
             <td class="station_level">
               <span v-if="station.generalInfo">
                 <span
diff --git a/src/locales/en.json b/src/locales/en.json
index 68fafad..6f975e4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -205,7 +205,6 @@
   },
   "sceneries": {
     "station": "Station",
-    "abbr": "Station\nabbrev.",
     "min-lvl": "Min. dispatcher\nlevel",
     "status": "Status",
     "dispatcher": "Dispatcher",
@@ -332,6 +331,7 @@
     "history-btn": "View the dispatcher history",
     "info-btn": "Return to the scenery view",
     "authors-title": "Scenery author | Scenery authors",
+    "abbrev": "Station symbol:",
     "lines-title": "Real lines",
     "project-title": "Project name",
     "one-way-routes": "One way routes",
@@ -383,7 +383,8 @@
     "desc-next-arrival": "Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
     "desc-departed": "The train is at the station and it's been departed. Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
     "desc-departed-away": "The train has been departed to: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-terminated": "The train terminates here"
+    "desc-end": "The train terminates here",
+    "desc-terminated": "The train has been terminated"
   },
   "history": {
     "title": "TIMETABLE JOURNAL",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 2dd5442..ee93fcc 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -336,6 +336,7 @@
     "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
     "info-btn": "Wróć do widoku scenerii",
     "authors-title": "Autor scenerii | Autorzy scenerii",
+    "abbrev": "Skrót posterunku:",
     "lines-title": "Rzeczywiste linie",
     "project-title": "Projekt",
     "one-way-routes": "Szlaki jednotorowe",
@@ -387,7 +388,8 @@
     "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
     "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
     "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-terminated": "Pociąg kończy bieg"
+    "desc-end": "Pociąg kończy bieg",
+    "desc-terminated": "Pociąg skończył bieg"
   },
   "history": {
     "title": "DZIENNIK ROZKŁADÓW JAZDY"
diff --git a/src/scripts/data/stationHeaderNames.ts b/src/scripts/data/stationHeaderNames.ts
index 6ebd0a2..4e82dc2 100644
--- a/src/scripts/data/stationHeaderNames.ts
+++ b/src/scripts/data/stationHeaderNames.ts
@@ -1,6 +1,5 @@
 export const headIds = [
   'station',
-  'abbr',
   'min-lvl',
   'status',
   'dispatcher',