Skip to content

Commit b796d7e

Browse files
1ec51ec5
authored
Merge pull request #146 from Project-OSRM/1ec5-phrase-test-143
Test phrases
2 parents 15c64bb + c0f7f8d commit b796d7e

File tree

77 files changed

+480
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+480
-220
lines changed

‎languages/translations/de.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Fähre nehmen Richtung {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Sie haben Ihr {nth} Ziel erreicht"

‎languages/translations/es.json

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Coge el ferry a {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one}, entonces a {distance}, {instruction_two}",
55+
"two linked": "{instruction_one}, entonces {instruction_two}",
56+
"one in distance": "A {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Has llegado a tu {nth} destino"
@@ -79,28 +84,41 @@
7984
},
8085
"continue": {
8186
"default": {
82-
"default": "Continúe {modifier}",
83-
"name": "Continúe {modifier} en {way_name}",
84-
"destination": "Continúe {modifier} hacia {destination}"
87+
"default": "Gire a {modifier}",
88+
"name": "Turn {modifier} to stay on {way_name}",
89+
"destination": "Gire a {modifier} hacia {destination}",
90+
"exit": "Gire a {modifier} en {way_name}"
8591
},
8692
"straight": {
8793
"default": "Continúe recto",
88-
"name": "Continúe en {way_name}",
89-
"destination": "Continúe hacia {destination}"
94+
"name": "Continue straight to stay on {way_name}",
95+
"destination": "Continúe hacia {destination}",
96+
"distance": "Continúe recto por {distance}",
97+
"namedistance": "Continúe recto en {way_name} por {distance}"
98+
},
99+
"sharp left": {
100+
"default": "Gire a la izquierda",
101+
"name": "Make a sharp left to stay on {way_name}",
102+
"destination": "Gire a la izquierda hacia {destination}"
103+
},
104+
"sharp right": {
105+
"default": "Gire a la derecha",
106+
"name": "Make a sharp right to stay on {way_name}",
107+
"destination": "Gire a la derecha hacia {destination}"
90108
},
91109
"slight left": {
92-
"default": "Continúe ligeramente a la izquierda",
93-
"name": "Continúe ligeramente a la izquierda en {way_name}",
94-
"destination": "Continúe ligeramente a la izquierda hacia {destination}"
110+
"default": "Gire a la izquierda",
111+
"name": "Make a slight left to stay on {way_name}",
112+
"destination": "Gire a la izquierda hacia {destination}"
95113
},
96114
"slight right": {
97-
"default": "Continúe ligeramente a la derecha",
98-
"name": "Continúe ligeramente a la derecha en {way_name}",
99-
"destination": "Continúe ligeramente a la derecha hacia {destination}"
115+
"default": "Gire a la izquierda",
116+
"name": "Make a slight right to stay on {way_name}",
117+
"destination": "Gire a la izquierda hacia {destination}"
100118
},
101119
"uturn": {
102120
"default": "Haz un cambio de sentido",
103-
"name": "Haz un cambio de sentido en {way_name}",
121+
"name": "Haz un cambio de sentido y continúe en {way_name}",
104122
"destination": "Haz un cambio de sentido hacia {destination}"
105123
}
106124
},
@@ -463,4 +481,4 @@
463481
}
464482
}
465483
}
466-
}
484+
}

‎languages/translations/fr.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"4": "quatrième",
1212
"5": "cinquième",
1313
"6": "sixième",
14-
"7": "setpième",
14+
"7": "septième",
1515
"8": "huitième",
1616
"9": "neuvième",
1717
"10": "dixième"
@@ -50,7 +50,12 @@
5050
"destination": "Prendre le ferry en direction de {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Vous êtes arrivés à votre {nth} destination"

‎languages/translations/id.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Naik ferry menuju {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Anda telah tiba di tujuan ke-{nth}"

‎languages/translations/it.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
"phrase": {
5454
"two linked by distance": "{instruction_one}, poi tra {distance} {instruction_two}",
5555
"two linked": "{instruction_one} poi {instruction_two}",
56-
"one in distance": "tra {distance} {instruction_one}"
56+
"one in distance": "tra {distance} {instruction_one}",
57+
"name and ref": "{name} ({ref})"
5758
},
5859
"arrive": {
5960
"default": {

‎languages/translations/nl.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Neem het veer naar {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Je bent gearriveerd op de {nth} bestemming."

‎languages/translations/pl.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Weź prom w kierunku {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Dojechano do miejsca docelowego {nth}"

‎languages/translations/pt-BR.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Pegue a balsa sentido {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Você chegou ao seu {nth} destino"

‎languages/translations/ru.json

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Погрузитесь на паром в направлении {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one}, затем через {distance} {instruction_two}",
55+
"two linked": "{instruction_one}, затем {instruction_two}",
56+
"one in distance": "Через {distance} {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Вы прибыли в {nth} пункт назначения"
@@ -80,14 +85,27 @@
8085
"continue": {
8186
"default": {
8287
"default": "Двигайтесь {modifier}",
83-
"name": "Двигайтесь {modifier} по {way_name}",
84-
"destination": "Двигайтесь {modifier} в направлении {destination}"
88+
"name": "Продолжите движение {modifier} по {way_name}",
89+
"destination": "Двигайтесь {modifier} в направлении {destination}",
90+
"exit": "Двигайтесь {modifier} по {way_name}"
8591
},
8692
"straight": {
8793
"default": "Двигайтесь прямо",
8894
"name": "Продолжите движение по {way_name}",
89-
"destination": "Продолжите движение в направлении {destination}"
95+
"destination": "Продолжите движение в направлении {destination}",
96+
"distance": "Двигайтесь прямо {distance}",
97+
"namedistance": "Двигайтесь прямо {distance} по {way_name}"
98+
},
99+
"sharp left": {
100+
"default": "Резко поверните налево",
101+
"name": "Резко поверните налево на {way_name}",
102+
"destination": "Резко поверните налево в направлении {destination}"
90103
},
104+
"sharp right": {
105+
"default": "Резко поверните направо",
106+
"name": "Резко поверните направо на {way_name}",
107+
"destination": "Резко поверните направо в направлении {destination}"
108+
},
91109
"slight left": {
92110
"default": "Плавно поверните налево",
93111
"name": "Плавно поверните налево на {way_name}",
@@ -100,7 +118,7 @@
100118
},
101119
"uturn": {
102120
"default": "Развернитесь",
103-
"name": "Развернитесь на {way_name}",
121+
"name": "Развернитесь и продолжите движение по {way_name}",
104122
"destination": "Развернитесь в направлении {destination}"
105123
}
106124
},

‎languages/translations/sv.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Ta färjan mot {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one}, sedan om {distance}, {instruction_two}",
55+
"two linked": "{instruction_one}, sedan {instruction_two}",
56+
"one in distance": "Om {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Du är framme vid din {nth} destination"

‎languages/translations/uk.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Скористайтесь поромом у напрямку {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Ви прибули у ваш {nth} пункт призначення"

‎languages/translations/vi.json

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "Lên phà đi {destination}"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one}, rồi {distance} nữa thì {instruction_two}",
55+
"two linked": "{instruction_one}, rồi {instruction_two}",
56+
"one in distance": "{distance} nữa thì {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "Đến nơi {nth}"
@@ -79,28 +84,41 @@
7984
},
8085
"continue": {
8186
"default": {
82-
"default": "Chạy tiếp bên {modifier}",
83-
"name": "Chạy tiếp bên {modifier} trên {way_name}",
84-
"destination": "Chạy tiếp bên {modifier} đến {destination}"
87+
"default": "Quẹo {modifier}",
88+
"name": "Quẹo {modifier} để chạy tiếp trên {way_name}",
89+
"destination": "Quẹo {modifier} đến {destination}",
90+
"exit": "Quẹo {modifier} vào {way_name}"
8591
},
8692
"straight": {
8793
"default": "Chạy thẳng",
8894
"name": "Chạy tiếp trên {way_name}",
89-
"destination": "Chạy tiếp đến {destination}"
95+
"destination": "Chạy tiếp đến {destination}",
96+
"distance": "Chạy thẳng cho {distance}",
97+
"namedistance": "Chạy tiếp trên {way_name} cho {distance}"
98+
},
99+
"sharp left": {
100+
"default": "Quẹo gắt bên trái",
101+
"name": "Quẹo gắt bên trái để chạy tiếp trên {way_name}",
102+
"destination": "Quẹo gắt bên trái đến {destination}"
103+
},
104+
"sharp right": {
105+
"default": "Quẹo gắt bên phải",
106+
"name": "Quẹo gắt bên phải để chạy tiếp trên {way_name}",
107+
"destination": "Quẹo gắt bên phải đến {destination}"
90108
},
91109
"slight left": {
92110
"default": "Nghiêng về bên trái",
93-
"name": "Nghiêng về bên trái vào {way_name}",
111+
"name": "Nghiêng về bên trái để chạy tiếp trên {way_name}",
94112
"destination": "Nghiêng về bên trái đến {destination}"
95113
},
96114
"slight right": {
97115
"default": "Nghiêng về bên phải",
98-
"name": "Nghiêng về bên phải vào {way_name}",
116+
"name": "Nghiêng về bên phải để chạy tiếp trên {way_name}",
99117
"destination": "Nghiêng về bên phải đến {destination}"
100118
},
101119
"uturn": {
102120
"default": "Quẹo ngược lại",
103-
"name": "Quẹo ngược lại {way_name}",
121+
"name": "Quẹo ngược lại trên {way_name}",
104122
"destination": "Quẹo ngược đến {destination}"
105123
}
106124
},
@@ -463,4 +481,4 @@
463481
}
464482
}
465483
}
466-
}
484+
}

‎languages/translations/zh-Hans.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"destination": "乘坐开往{destination}的轮渡"
5151
}
5252
},
53-
"phrase": {},
53+
"phrase": {
54+
"two linked by distance": "{instruction_one} then in {distance} {instruction_two}",
55+
"two linked": "{instruction_one} then {instruction_two}",
56+
"one in distance": "In {distance}, {instruction_one}",
57+
"name and ref": "{name} ({ref})"
58+
},
5459
"arrive": {
5560
"default": {
5661
"default": "您已经到达您的{nth}个目的地"

‎test/fixtures/v5/continue/left_default.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"instructions": {
1010
"de": "Links weiterfahren",
1111
"en": "Turn left",
12-
"es": "Continúe izquierda",
12+
"es": "Gire a izquierda",
1313
"fr": "Continuer à gauche",
1414
"id": "Terus kiri",
1515
"it": "Continua a sinistra",
@@ -19,7 +19,7 @@
1919
"ru": "Двигайтесь налево",
2020
"sv": "Fortsätt vänster",
2121
"uk": "Рухайтесь ліворуч",
22-
"vi": "Chạy tiếp bên trái",
22+
"vi": "Quẹo trái",
2323
"zh-Hans": "继续向左"
2424
}
2525
}

‎test/fixtures/v5/continue/left_destination.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"instructions": {
1111
"de": "Links weiterfahren Richtung Destination 1",
1212
"en": "Turn left towards Destination 1",
13-
"es": "Continúe izquierda hacia Destination 1",
13+
"es": "Gire a izquierda hacia Destination 1",
1414
"fr": "Continuer à gauche en direction de Destination 1",
1515
"id": "Teruskan kiri menuju Destination 1",
1616
"it": "Continua a sinistra verso Destination 1",
@@ -20,7 +20,7 @@
2020
"ru": "Двигайтесь налево в направлении Destination 1",
2121
"sv": "Fortsätt vänster mot Destination 1",
2222
"uk": "Рухайтесь ліворуч у напрямку Destination 1",
23-
"vi": "Chạy tiếp bên trái đến Destination 1",
23+
"vi": "Quẹo trái đến Destination 1",
2424
"zh-Hans": "继续向左行驶，前往Destination 1"
2525
}
2626
}

‎test/fixtures/v5/continue/left_exit.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"instructions": {
1111
"de": "Links weiterfahren auf Way Name",
1212
"en": "Turn left onto Way Name",
13-
"es": "Continúe izquierda en Way Name",
13+
"es": "Gire a izquierda en Way Name",
1414
"fr": "Continuer à gauche sur Way Name",
1515
"id": "Terus kiri ke Way Name",
1616
"it": "Continua a sinistra in Way Name",
@@ -20,7 +20,7 @@
2020
"ru": "Двигайтесь налево по Way Name",
2121
"sv": "Fortsätt vänster in på Way Name",
2222
"uk": "Рухайтесь ліворуч на Way Name",
23-
"vi": "Chạy tiếp bên trái trên Way Name",
23+
"vi": "Quẹo trái vào Way Name",
2424
"zh-Hans": "继续向左，上Way Name"
2525
}
2626
}

0 commit comments

Comments
 (0)