Skip to content

Commit cb46bec

Browse files
committed
Add distance and phrase support
- Adds three phrases to the English translations for combining instructions and referencing instruction in relation to distance. - Adds `distance` support to the English `continue.default` and `continue.straight` instructions. - Adds a `distanceunits` constants object and fills this out in English for basic driving units in both the metric and imperial systems.
1 parent 708583d commit cb46bec

File tree

14 files changed

+64
-21
lines changed

14 files changed

+64
-21
lines changed

languages/translations/de.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Links halten",
4242
"xox": "Mittlere Spur nutzen",
4343
"oxo": "Rechts oder links halten"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Fähre nehmen Richtung {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Sie haben Ihr {nth} Ziel erreicht"
@@ -413,4 +415,4 @@
413415
}
414416
}
415417
}
416-
}
418+
}

languages/translations/en.json

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
"ox": "Keep left",
4242
"xox": "Keep in the middle",
4343
"oxo": "Keep left or right"
44+
},
45+
"distanceunits": {
46+
"feet": "feet",
47+
"foot": "foot",
48+
"miles": "miles",
49+
"mile": "mile",
50+
"meter": "meter",
51+
"meters": "meters",
52+
"kilometer": "kilometer",
53+
"kilometers": "kilometers"
4454
}
4555
},
4656
"modes": {
@@ -50,6 +60,11 @@
5060
"destination": "Take the ferry towards {destination}"
5161
}
5262
},
63+
"phrase": {
64+
"twolinkedbydistance": "{instruction_one} then in {distance} {instruction_two}",
65+
"twolinked": "{instruction_one} then {instruction_two}",
66+
"oneindistance": "In {distance}, {instruction_one}"
67+
},
5368
"arrive": {
5469
"default": {
5570
"default": "You have arrived at your {nth} destination"
@@ -80,12 +95,15 @@
8095
"default": {
8196
"default": "Continue {modifier}",
8297
"name": "Continue {modifier} onto {way_name}",
83-
"destination": "Continue {modifier} towards {destination}"
98+
"destination": "Continue {modifier} towards {destination}",
99+
"distance": "Continue for {distance}",
100+
"namedistance": "Continue on {way_name} for {distance}"
84101
},
85102
"straight": {
86103
"default": "Continue straight",
87104
"name": "Continue onto {way_name}",
88-
"destination": "Continue towards {destination}"
105+
"destination": "Continue towards {destination}",
106+
"distance": "Continue straight for {distance}"
89107
},
90108
"slight left": {
91109
"default": "Continue slightly left",

languages/translations/es.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Mantengase a la izquierda",
4242
"xox": "Mantengase en el medio",
4343
"oxo": "Mantengase a la izquierda o derecha"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Coge el ferry a {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Has llegado a tu {nth} destino"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Serrer à gauche",
4242
"xox": "Rester au milieu",
4343
"oxo": "Rester à gauche ou à droite"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Prendre le ferry en direction de {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Vous êtes arrivés à votre {nth} destination"

languages/translations/id.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Tetap di kiri",
4242
"xox": "Tetap di tengah",
4343
"oxo": "Tetap di kiri atau kanan"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Naik ferry menuju {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Anda telah tiba di tujuan ke-{nth}"

languages/translations/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Mantieni la sinistra",
4242
"xox": "Rimani in mezzo",
4343
"oxo": "Mantieni la destra o la sinistra"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Prendi il traghetto verso {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Sei arrivato alla tua {nth} destinazione"

languages/translations/nl.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Links aanhouden",
4242
"xox": "In het midden blijven",
4343
"oxo": "Links of rechts blijven"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Neem het veer naar {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Je bent gearriveerd op de {nth} bestemming."

languages/translations/pl.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Trzymaj się lewej strony",
4242
"xox": "Trzymaj się środka",
4343
"oxo": "Trzymaj się lewej lub prawej strony"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Weź prom w kierunku {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Dojechano do miejsca docelowego {nth}"

languages/translations/pt-BR.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Mantenha-se à esquerda",
4242
"xox": "Mantenha-se ao centro",
4343
"oxo": "Mantenha-se à esquerda ou direita"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Pegue a balsa sentido {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Você chegou ao seu {nth} destino"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/ru.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Держитесь левее",
4242
"xox": "Держитесь посередине",
4343
"oxo": "Держитесь слева или справа"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Погрузитесь на паром в направлении {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Вы прибыли в {nth} пункт назначения"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/sv.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Håll till vänster",
4242
"xox": "Håll till mitten",
4343
"oxo": "Håll till vänster eller höger"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Ta färjan mot {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Du är framme vid din {nth} destination"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/uk.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Тримайтесь ліворуч",
4242
"xox": "Тримайтесь в середині",
4343
"oxo": "Тримайтесь праворуч або ліворуч"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Скористайтесь поромом у напрямку {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Ви прибули у ваш {nth} пункт призначення"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/vi.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"ox": "Đi bên trái",
4242
"xox": "Đi vào giữa",
4343
"oxo": "Đi bên trái hay bên phải"
44-
}
44+
},
45+
"distanceunits": {}
4546
},
4647
"modes": {
4748
"ferry": {
@@ -50,6 +51,7 @@
5051
"destination": "Lên phà đi {destination}"
5152
}
5253
},
54+
"phrase": {},
5355
"arrive": {
5456
"default": {
5557
"default": "Đến nơi {nth}"
@@ -418,4 +420,4 @@
418420
}
419421
}
420422
}
421-
}
423+
}

languages/translations/zh-Hans.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"destination": "乘坐开往{destination}的轮渡"
5151
}
5252
},
53+
"phrase": {},
5354
"arrive": {
5455
"default": {
5556
"default": "您已经到达您的{nth}个目的地"

0 commit comments

Comments
 (0)