diff --git a/src/components/Order/OrderFooter.vue b/src/components/Order/OrderFooter.vue
index 43a77b9..2db4ebc 100644
--- a/src/components/Order/OrderFooter.vue
+++ b/src/components/Order/OrderFooter.vue
@@ -9,7 +9,7 @@
class="order-input"
id="footer-V"
v-model="store.orderData.footer.V"
- placeholder="Nick maszynisty"
+ :placeholder="t('order.footer.V-placeholder')"
/>
@@ -21,7 +21,7 @@
class="order-input"
id="footer-W"
v-model="store.orderData.footer.W"
- placeholder="Nick dyżurnego"
+ :placeholder="t('order.footer.W-placeholder')"
/>
@@ -36,7 +36,7 @@
class="order-input"
id="footer-Y"
v-model="store.orderData.footer.Y"
- placeholder="Godzina w formacie HH:MM"
+ :placeholder="t('order.footer.Y-placeholder')"
/>
@@ -48,7 +48,7 @@
class="order-input"
id="footer-Z"
v-model="store.orderData.footer.Z"
- placeholder="RD-(nr rozkazu)-(hash sc.)-(2 ostatnie cyfry roku)"
+ :placeholder="t('order.footer.Z-placeholder')"
/>
diff --git a/src/locales/en.json b/src/locales/en.json
index 1887c18..66270c4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -74,202 +74,206 @@
"no-trains": "No trains to display"
},
"order": {
- "title": "Train order",
+ "title": "Polish Railway Train Order",
"header": {
- "A": "A Nr pociągu {'|'} składu manewrowego",
- "A-placeholder": "Numer pociągu lub manewru",
- "B": "B Data",
- "C": "C Lokalizacja pociągu {'|'} składu manewrowego",
- "C-placeholder": "Nazwa posterunku lub szlaku",
- "D": "D Lokalizacja nadawcy",
- "D-placeholder": "Nazwa posterunku"
+ "A": "A Train No {'|'} Shunting composition No",
+ "A-placeholder": "Train / shunting composition number",
+ "B": "B Date",
+ "C": "C Location of train {'|'} Location of shunting composition",
+ "C-placeholder": "Line or post name",
+ "D": "D Location of issuer",
+ "D-placeholder": "Post name"
},
"22": {
- "text": "Dotyczy jazdy torem lewym",
- "message-html": "Dotyczy jazdy torem lewym"
+ "text": "Applies to left-track traffic",
+ "message-html": "Applies to left-track traffic"
},
"99": {
- "text": "Odwołanie rozkazu pisemnego",
- "x1": "x.1 Identyfikator rozkazu pisemnego",
- "message-html": "Odwołanie rozkazu pisemnego {0}"
+ "text": "Revoke the train order",
+ "x1": "x.1 Train order identifier",
+ "message-html": "Revoke the train order {0}"
},
"2110": {
- "text": "{bold1} z toru nr {track1} z {signalbox1} {br} na tor nr {track2} w kierunku {signalbox2} {br} Pominięcie sygnałów stój {signal1} i {signal2} i {signal3}",
- "bold1": "Zezwalam na wyjazd",
- "track1": "x.1 tor",
- "signalbox1": "x.2 posterunek",
- "track2": "x.3 tor",
- "signalbox2": "x.4 posterunek",
- "signal1": "x.5 sygnalizator",
- "signal2": "x.6 sygnalizator",
- "signal3": "x.7 sygnalizator",
- "message-html": "Zezwalam na wyjazd z toru nr {0} z {1} na tor nr {2} w kierunku {3}. Pominięcie sygnałów stój {4} i {5} i {6}"
+ "text": "{bold1} from track no. {track1} from {signalbox1} {br} to track no. {track2} in the direction of {signalbox2} {br} Pass Stop signals {signal1} and {signal2} and {signal3}",
+ "bold1": "Is allowed to exit",
+ "track1": "x.1 track",
+ "signalbox1": "x.2 signalbox",
+ "track2": "x.3 track",
+ "signalbox2": "x.4 signalbox",
+ "signal1": "x.5 signal",
+ "signal2": "x.6 signal",
+ "signal3": "x.7 signal",
+ "message-html": "Is allowed to exit from track no. {0} from {1} to track no. {2} in the direction of {3}. Pass Stop signals {4} and {5} and {6}"
},
"2115": {
- "text": "{bold1} z toru nr {track1} do {signalbox1} na tor nr {track2} {br} Pominięcie sygnałów {signal1} i {signal2} i {signal3}",
- "bold1": "Zezwalam na wjazd",
- "track1": "x.1 tor",
- "signalbox1": "x.2 posterunek",
- "track2": "x.3 tor",
- "signal1": "x.4 sygnalizator",
- "signal2": "x.5 sygnalizator",
- "signal3": "x.6 sygnalizator",
- "message-html": "Zezwalam na wjazd z toru nr {0} do {1} na tor nr {2} Pominięcie sygnałów {3} i {4} i {5}"
+ "text": "{bold1} from track no. {track1} to {signalbox1} on track no. {track2} {br} Pass signals {signal1} and {signal2} and {signal3}",
+ "bold1": "Is allowed to enter",
+ "track1": "x.1 track",
+ "signalbox1": "x.2 signalbox",
+ "track2": "x.3 track",
+ "signal1": "x.4 signal",
+ "signal2": "x.5 signal",
+ "signal3": "x.6 signal",
+ "message-html": "Is allowed to enter from track no. {0} to {1} on track no. {2}. Pass signals {3} and {4} and {5}"
},
"2120": {
- "text": "Od {signalbox1} do {signalbox2} po torze {track1} {br} {highlight1} {br} {underline1}{highlight2}.",
- "highlight1": "wskazania semaforów SBL są nieważne.",
- "underline1": "Zachować ostrożność od semafora ze wskaźnikiem",
+ "text": "From {signalbox1} to {signalbox2} on track {track1} {br} {highlight1} {br} {underline1}{highlight2}.",
+ "highlight1": "SBL signalling indications are to be ignored.",
+ "underline1": "Stay alert after passing the signal with indicator",
"highlight2": " W18",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
- "track1": "x.3 nr toru",
- "message-html": "Od {0} do {1} po torze {2} wskazania semaforów SBL są nieważne. Zachować ostrożność od semafora ze wskaźnikiem W18."
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
+ "track1": "x.3 track no",
+ "message-html": "From {0} to {1} on track {2} SBL signals are to be ignored. Stay alert after passing the signal with indicator W18."
},
"2125": {
- "text": "Zezwalam przejechać za {select1} w kierunku {signalbox1} torem {track1} do km {km1} do godz. {hour1}.",
- "select1-a": "wskaźnik W5",
- "select1-b": "ostatni rozjazd",
- "signalbox1": "x.1 posterunek",
- "track1": "x.2 tor",
+ "text": "Is allowed to pass {select1} in the direction of {signalbox1} on track {track1} to km {km1} to hour {hour1}.",
+ "select1-a": "indicator W5",
+ "select1-b": "last switch",
+ "signalbox1": "x.1 signalbox",
+ "track1": "x.2 track",
"km1": "x.3 km",
- "hour1": "x.4 godzina",
- "message-html": "Zezwalam przejechać za {0} w kierunku {1} torem {2} do km {3} do godz. {4}."
+ "hour1": "x.4 hour",
+ "message-html": "Is allowed to pass {0} in the direction of {1} on track {2} to km {3} to hour {4}."
},
"2135": {
- "text": "{bold1} po torze nr {track1} w kierunku {signalbox1}.",
- "bold1": "Zezwalam na kontynuacje jazdy",
- "track1": "x.1 tor",
- "signalbox1": "x.2 posterunek",
- "message-html": "Zezwalam na kontynuacje jazdy po torze {0} w kierunku {1}"
+ "text": "{bold1} on track no. {track1} in the direction of {signalbox1}.",
+ "bold1": "Is allowed to proceed",
+ "track1": "x.1 track",
+ "signalbox1": "x.2 signalbox",
+ "message-html": "Is allowed to proceed on track no. {0} in the direction of {1}"
},
"2140": {
- "text": "{bold1} na posterunku/szlaku {signalbox1}{'|'}{signalbox2} w km {km1} celem {other1}",
- "bold1": "Zatrzymanie pociągu",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
+ "text": "{bold1} at post/line {signalbox1}{'|'}{signalbox2} at km {km1} for {other1}",
+ "bold1": "Train halt",
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
"km1": "x.3 km",
- "other1": "x.96 inne",
- "message-html": "Zatrzymanie pociągu na posterunku/szlaku {0} {'|'} {1} w km {2} celem {3}"
+ "other1": "x.96 cause",
+ "message-html": "Train halt at post {0} at km {2} for {3} | Train halt on line {0} {'|'} {1} at km {2} for {3} | Train halt on line {0} {'|'} {1} at km {2} for {3}"
},
"2145": {
- "text": "Na {signalbox1} na sygnalizatorze {signal1} {bold1}",
- "bold1": "sygnał zezwalający jest nieważny, zatrzymać pociąg przed tym sygnalizatorem.",
- "signalbox1": "x.1 posterunek",
- "signal1": "x.2 sygnalizator",
- "message-html": "Na {0} na sygnalizatorze {1} sygnał zezwalający jest nieważny, zatrzymać pociąg przed tym sygnalizatorem."
+ "text": "At {signalbox1} the clear signal {signal1}{br}{bold1}",
+ "bold1": "is invalid. Stop the train before this signal.",
+ "signalbox1": "x.1 signalbox",
+ "signal1": "x.2 signal",
+ "message-html": "At {0} the clear signal {1} is invalid, stop the train before this signal."
},
"2150": {
- "text": "{bold1} przejazdowych na posterunku/szlaku {br} {signalbox1} / {signalbox2} odnoszących się do przejazdu w km {km1}{br}{bold2}",
- "bold1": "Wskazania tarcz ostrzegawczych",
- "bold2": "są nieważne. Jazda z prędkością rozkładową.",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
+ "text": "{bold1} at post/line {br} {signalbox1} / {signalbox2} referring to level crossing at km {km1}{br}{bold2}",
+ "bold1": "Level crossing distant signals (TOP)",
+ "bold2": "are to be ignored. Proceed with timetable speed.",
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
"km1": "x.3 km",
- "message-html": "Wskazania tarcz ostrzegawczych przejazdowych na posterunku/szlaku {1} / {2} odnoszących się do przejazdu w km {3}, są nieważne. Jazda z prędkością rozkładową."
+ "message-html": "Level crossing distant signals (TOP) at post {0} referring to level crossing at km {1} are to be ignored. Proceed with timetable speed. | Wskazania tarcz ostrzegawczych na line {0} / {1} referring to level crossing at km {2} are to be ignored. Proceed with timetable speed. | Wskazania tarcz ostrzegawczych na line {0} / {1} referring to level crossing at km {2} are to be ignored. Proceed with timetable speed."
},
"2155": {
- "text": "{bold1} na posterunku/szlaku {signalbox1}{'|'}{signalbox2} odnoszące się do sygnalizatora {signal1}.",
- "bold1": "Uszkodzone urządzenia SHP",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
- "signal1": "x.3 sygnalizator",
- "message-html": "Uszkodzone urządzenia SHP na posterunku/szlaku {0}{'|'}{1} odnoszące się do sygnalizatora {3}"
+ "text": "{bold1} at post/line {signalbox1}{'|'}{signalbox2} referring to signal {signal1}.",
+ "bold1": "Damaged SHP device",
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
+ "signal1": "x.3 signal",
+ "message-html": "Damaged SHP device at post {0} referring to signal {2}|Damaged SHP device on line {0} {'|'} {1} referring to signal {2}|Uszkodzone urządzenia SHP on line {0} {'|'} {1} referring to signal {2}"
},
"2160": {
- "text": "{bold1} na odcinku od {signalbox1} do {signalbox2}, jazda przez {signalbox3} linią {line1} z prędkością {vmax1}.",
- "bold1": "Zmiana trasy",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
- "signalbox3": "x.3 posterunek",
- "line1": "x.4 linia",
+ "text": "{bold1} from {signalbox1} to {signalbox2}, rerouted via {signalbox3} by line {line1} with the speed of {vmax1}.",
+ "bold1": "Route change",
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
+ "signalbox3": "x.3 signalbox",
+ "line1": "x.4 line",
"vmax1": "x.5 km/h",
- "message-html": "Zmiana trasy na odcinku od {0} do {1}, jazda przez {2} linią {3} z prędkością {4}."
+ "message-html": "Route change from {0} to {1}, rerouted via {2} by line {3} with the speed of {4}."
},
"2165": {
- "text": "{bold1} na odcinku od {km1} do {km2}.",
- "bold1": "Jazda z opuszczonymi pantografami",
+ "text": "{bold1} from {km1} to {km2}.",
+ "bold1": "Run with lowered pantographs",
"km1": "x.1 km",
"km2": "x.2 km",
- "message-html": "Jazda z opuszczonymi pantografami na odcinku od {0} do {1}."
+ "message-html": "Run with lowered pantographs from {0} to {1}."
},
"2170": {
- "text": "{bold1} od {signalbox1} do {signalbox2} linii nr {line1}{br}{bold2}",
- "bold1": "Na odcinku",
- "bold2": "jazda pociągu z łącznością analogową.",
- "signalbox1": "x.1 posterunek",
- "signalbox2": "x.2 posterunek",
- "line1": "x.3 linia",
- "message-html": "Na odcinku na odcinku od {0} do {1} linii nr {2} jazda pociągu z łącznością analogową."
+ "text": "{bold1} {signalbox1} and {signalbox2} of the line no. {line1}{br}{bold2}",
+ "bold1": "At section between",
+ "bold2": "ride with the analog contact.",
+ "signalbox1": "x.1 signalbox",
+ "signalbox2": "x.2 signalbox",
+ "line1": "x.3 line",
+ "message-html": "At section between {0} and {1} of the line no. {2} ride with the analog contact."
},
"2180": {
- "text": "{bold1} nr {track1} w kierunku {signalbox1} do km {km1} zjazd do {signalbox2} do godz. {hour1}",
- "bold1": "Polecam jazdę po torze zamkniętym",
+ "text": "{bold1} no. {track1} in the directon of {signalbox1} to km {km1} turning to {signalbox2} until hour {hour1}",
+ "bold1": "Run on the closed track",
"track1": "x.1 tor",
- "signalbox1": "x.2 posterunek",
+ "signalbox1": "x.2 signalbox",
"km1": "x.3 km",
- "signalbox2": "x.4 posterunek",
- "hour1": "x.5 godzina",
- "message-html": "Polecam jazdę po torze zamkniętym nr {0} w kierunku {1} do km {2} zjazd do {3} do godz. {4}"
+ "signalbox2": "x.4 signalbox",
+ "hour1": "x.5 hour",
+ "message-html": "Run on the closed track no. {0} in the directon of {1} to km {2} turning to {3} until hour {4}"
},
"2181": {
"text": "{bold1}",
- "bold1": "Tor zamknięty wolny od taboru",
- "message-html": "Tor zamknięty wolny od taboru "
+ "bold1": "Track is closed with no rolling stock",
+ "message-html": "Track is closed with no rolling stock "
},
"2182": {
- "text": "{bold1} {train1} w km {km1}",
- "bold1": "Na torze pracuje pociąg",
- "train1": "x.1 numer pociągu",
+ "text": "Train {train1} {bold1} at km {km1}",
+ "bold1": "is working on track",
+ "train1": "x.1 train no.",
"km1": "x.2 km",
- "message-html": "Na torze pracuje pociąg {0} w km {1}"
+ "message-html": "Train {0} is working on track at km {1}"
},
"2183": {
- "text": "{bold1} {train1} do km {km1}",
- "bold1": "Na tor zostanie wyprawiony pociąg",
- "train1": "x.1 numer pociągu",
+ "text": "Train {train1} {bold1} to km {km1}",
+ "bold1": "will be dispatched",
+ "train1": "x.1 train no.",
"km1": "x.2 km",
- "message-html": "Na tor zostanie wyprawiony pociąg {0} do km {1}"
+ "message-html": "Train {0} will be dispatched to km {1}"
},
"2185": {
- "text": "{bold1} na tor nr {track1} w km {km1} na szlaku {'|'} {signalbox1} {'|'} {signalbox2}",
- "bold1": "Zezwalam na wstawienie PSD",
- "track1": "x.1 tor",
+ "text": "{bold1} on track no. {track1} at km {km1} on line {signalbox1} {'|'} {signalbox2}",
+ "bold1": "Is allowed to insert a PSD vehicle",
+ "track1": "x.1 track",
"km1": "x.2 km",
- "signalbox1": "x.3 posterunek",
- "signalbox2": "x.4 posterunek",
- "message-html": "Zezwalam na wstawienie PSD na tor nr {0} w km {1} na szlaku {'|'} {2} {'|'} {3}"
+ "signalbox1": "x.3 signalbox",
+ "signalbox2": "x.4 signalbox",
+ "message-html": "Is allowed to insert a PSD vehicle on track no. {0} at km {1} on line {2} {'|'} {3}"
},
"2310": {
"text": "{bold1}{br}{text-list}",
- "bold1": "Nie przekraczać prędkości i zachować ostrożność:",
- "text-list": "{bold} {signalbox1}/{signalbox2} tor nr {track1} {v} {vmax1} od {km1} do {km2} {other1}",
- "bold": "{0}. Na posterunku/szlaku",
- "signalbox1": "x.{0} posterunek",
- "signalbox2": "x.{0} posterunek",
- "track1": "x.{0} tor",
+ "bold1": "Do not exceed the speed and stay alert:",
+ "text-list": "{bold} {signalbox1}/{signalbox2} track no. {track1} {v} {vmax1} from {km1} to {km2} {other1}",
+ "bold": "{0}. On post/line",
+ "signalbox1": "x.{0} signalbox",
+ "signalbox2": "x.{0} signalbox",
+ "track1": "x.{0} track",
"vmax1": "x.{0} km/h",
"km1": "x.{0} km",
"km2": "x.{0} km",
- "other1": "x.{1} przyczyna",
+ "other1": "x.{1} cause",
"message-html": "Nie przekraczać prędkości i zachować ostrożność:",
- "message-html-list": "{0}. Na posterunku/szlaku {1}/{2} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}"
+ "message-html-list": "{0}. On post {1} track no. {3} v{4}km/h from {5}km to {6}km - cause: {7}|{0}. On post {1} tor nr {3} v{4} from {5}km to {6}km - cause: {7}|{0}. On line {1}/{2} tor nr {3} v{4} from {5}km to {6}km - cause: {7}"
},
"2311": {
"text": "{bold1}",
- "bold1": "Podawać sygnał „Baczność”",
- "message-html": "Podawać sygnał „Baczność”"
+ "bold1": "Use „Baczność” signal multiple times",
+ "message-html": "Use „Baczność” signal multiple times"
},
"2320": {
"text": "{other2320}",
- "other2320": "x.96 inne",
- "message-html": "Inne: {0}"
+ "other2320": "x.96 other",
+ "message-html": "Other: {0}"
},
"footer": {
- "V": "V Identyfikator maszynisty",
- "W": "W Identyfikator nadawcy",
- "Y": "Y Godzina",
- "Z": "Z Identyfikator rozkazu pisemnego"
+ "V": "V Driver identifier",
+ "V-placeholder": "Driver nickname",
+ "W": "W Issuer identifier",
+ "W-placeholder": "Dispatcher nickname",
+ "Y": "Y Hour",
+ "Y-placeholder": "HH:MM, e.g. 09:25",
+ "Z": "Z Train order identifier",
+ "Z-placeholder": "RD-(order no.)-(sc. hash)-(2 last year digits)"
}
}
}
\ No newline at end of file
diff --git a/src/locales/pl.json b/src/locales/pl.json
index a5e9cbf..578f736 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -141,7 +141,7 @@
"bold1": "Zezwalam na kontynuacje jazdy",
"track1": "x.1 tor",
"signalbox1": "x.2 posterunek",
- "message-html": "Zezwalam na kontynuacje jazdy po torze {0} w kierunku {1}"
+ "message-html": "Zezwalam na kontynuacje jazdy po torze nr {0} w kierunku {1}"
},
"2140": {
"text": "{bold1} na posterunku/szlaku {signalbox1}{'|'}{signalbox2} w km {km1} celem {other1}",
@@ -153,7 +153,7 @@
"message-html": "Zatrzymanie pociągu na posterunku {0} w km {2} celem {3} | Zatrzymanie pociągu na szlaku {0} {'|'} {1} w km {2} celem {3} | Zatrzymanie pociągu na szlaku {0} {'|'} {1} w km {2} celem {3}"
},
"2145": {
- "text": "Na {signalbox1} na sygnalizatorze {signal1} {bold1}",
+ "text": "Na {signalbox1} na sygnalizatorze {signal1}{br}{bold1}",
"bold1": "sygnał zezwalający jest nieważny, zatrzymać pociąg przed tym sygnalizatorem.",
"signalbox1": "x.1 posterunek",
"signal1": "x.2 sygnalizator",
@@ -253,7 +253,7 @@
"km2": "x.{0} km",
"other1": "x.{1} przyczyna",
"message-html": "Nie przekraczać prędkości i zachować ostrożność:",
- "message-html-list": "{0}. Na posterunku {1} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}|{0}. Na posterunku {1} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}|{0}. Na szlaku {1}/{2} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}"
+ "message-html-list": "{0}. Na posterunku {1} tor nr {3} v{4}km/h od {5}km do {6}km - przyczyna: {7}|{0}. Na posterunku {1} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}|{0}. Na szlaku {1}/{2} tor nr {3} v{4} od {5}km do {6}km - przyczyna: {7}"
},
"2311": {
"text": "{bold1}",
diff --git a/src/store/store.ts b/src/store/store.ts
index 1e31ef8..4242219 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -144,7 +144,7 @@ export const useStore = defineStore('store', {
signal1: ''
},
optionalFieldNames: [],
- textDirectives: ['bold1']
+ textDirectives: ['bold1', 'br']
},
{
key: '2150',
@@ -205,7 +205,7 @@ export const useStore = defineStore('store', {
line1: ''
},
optionalFieldNames: [],
- textDirectives: ['bold1', 'br']
+ textDirectives: ['bold1', 'br', 'bold2']
},
{
key: '2180',