From a021deae96d240390cd47cb8770ea61d96f4b988 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 22 Nov 2025 22:54:43 +0100 Subject: [PATCH] refactor: scenery timetables history date parsing --- .../SceneryView/SceneryTimetablesHistory.vue | 42 +++++++++++-------- src/locales/en.json | 2 +- src/locales/pl.json | 4 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue index d8909c2..9588a6f 100644 --- a/src/components/SceneryView/SceneryTimetablesHistory.vue +++ b/src/components/SceneryView/SceneryTimetablesHistory.vue @@ -40,24 +40,7 @@ {{ $t('scenery.timetable-issued-date') }} - {{ - localeDateTime( - timetableHistory.createdAt > timetableHistory.beginDate - ? timetableHistory.beginDate - : timetableHistory.createdAt, - $i18n.locale - ) - }} - - - {{ $t('scenery.timetable-issued-by') }} - - - {{ timetableHistory.authorName }} - + {{ parseCreatedDate(timetableHistory, $i18n.locale) }} @@ -71,6 +54,17 @@ + + + {{ $t('scenery.timetable-issued-by') }} + + + {{ timetableHistory.authorName }} + + + @@ -184,6 +178,18 @@ export default defineComponent({ [`search-${this.checkedHistoryMode}`]: this.station?.name || this.onlineScenery?.name } }); + }, + + parseCreatedDate(timetable: API.TimetableHistory.Data, locale: string) { + const createdDate = + timetable.createdAt > timetable.beginDate + ? new Date(timetable.beginDate) + : new Date(timetable.createdAt); + + return createdDate.toLocaleString(locale == 'pl' ? 'pl-PL' : 'en-GB', { + timeStyle: 'short', + dateStyle: 'medium' + }); } }, components: { Loading } diff --git a/src/locales/en.json b/src/locales/en.json index 5090cba..4e74fd5 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -566,7 +566,7 @@ "timetable-terminatingAt": "ENDS HERE", "timetable-issued-date": "Issued", "timetable-issued-by": " by:", - "timetable-issued-for": " for driver:", + "timetable-issued-for": " for:", "dispatcher-rate": "Rate:", "dispatcher-status-changes": "Status changes:", "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required", diff --git a/src/locales/pl.json b/src/locales/pl.json index 7d50dc7..630b627 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -550,9 +550,9 @@ "timetable-via": "PRZEJEŻDŻA", "timetable-issuedFrom": "ROZPOCZYNA BIEG", "timetable-terminatingAt": "KOŃCZY BIEG", - "timetable-issued-date": "Wystawiony", + "timetable-issued-date": "Wystawiony: ", "timetable-issued-by": " przez:", - "timetable-issued-for": " dla maszynisty:", + "timetable-issued-for": " dla:", "dispatcher-rate": "Ocena:", "dispatcher-status-changes": "Zmiany statusów:", "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",