diff --git a/languages/translations/de.json b/languages/translations/de.json index dd045f55a..7f26c5605 100644 --- a/languages/translations/de.json +++ b/languages/translations/de.json @@ -50,7 +50,12 @@ "destination": "Fähre nehmen Richtung {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Sie haben Ihr {nth} Ziel erreicht" diff --git a/languages/translations/es.json b/languages/translations/es.json index a04eafb33..611e1263d 100644 --- a/languages/translations/es.json +++ b/languages/translations/es.json @@ -50,7 +50,12 @@ "destination": "Coge el ferry a {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one}, entonces a {distance}, {instruction_two}", + "two linked": "{instruction_one}, entonces {instruction_two}", + "one in distance": "A {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Has llegado a tu {nth} destino" @@ -79,28 +84,41 @@ }, "continue": { "default": { - "default": "Continúe {modifier}", - "name": "Continúe {modifier} en {way_name}", - "destination": "Continúe {modifier} hacia {destination}" + "default": "Gire a {modifier}", + "name": "Turn {modifier} to stay on {way_name}", + "destination": "Gire a {modifier} hacia {destination}", + "exit": "Gire a {modifier} en {way_name}" }, "straight": { "default": "Continúe recto", - "name": "Continúe en {way_name}", - "destination": "Continúe hacia {destination}" + "name": "Continue straight to stay on {way_name}", + "destination": "Continúe hacia {destination}", + "distance": "Continúe recto por {distance}", + "namedistance": "Continúe recto en {way_name} por {distance}" + }, + "sharp left": { + "default": "Gire a la izquierda", + "name": "Make a sharp left to stay on {way_name}", + "destination": "Gire a la izquierda hacia {destination}" + }, + "sharp right": { + "default": "Gire a la derecha", + "name": "Make a sharp right to stay on {way_name}", + "destination": "Gire a la derecha hacia {destination}" }, "slight left": { - "default": "Continúe ligeramente a la izquierda", - "name": "Continúe ligeramente a la izquierda en {way_name}", - "destination": "Continúe ligeramente a la izquierda hacia {destination}" + "default": "Gire a la izquierda", + "name": "Make a slight left to stay on {way_name}", + "destination": "Gire a la izquierda hacia {destination}" }, "slight right": { - "default": "Continúe ligeramente a la derecha", - "name": "Continúe ligeramente a la derecha en {way_name}", - "destination": "Continúe ligeramente a la derecha hacia {destination}" + "default": "Gire a la izquierda", + "name": "Make a slight right to stay on {way_name}", + "destination": "Gire a la izquierda hacia {destination}" }, "uturn": { "default": "Haz un cambio de sentido", - "name": "Haz un cambio de sentido en {way_name}", + "name": "Haz un cambio de sentido y continúe en {way_name}", "destination": "Haz un cambio de sentido hacia {destination}" } }, @@ -463,4 +481,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/fr.json b/languages/translations/fr.json index 7502abe6f..93ef3b41c 100644 --- a/languages/translations/fr.json +++ b/languages/translations/fr.json @@ -11,7 +11,7 @@ "4": "quatrième", "5": "cinquième", "6": "sixième", - "7": "setpième", + "7": "septième", "8": "huitième", "9": "neuvième", "10": "dixième" @@ -50,7 +50,12 @@ "destination": "Prendre le ferry en direction de {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Vous êtes arrivés à votre {nth} destination" diff --git a/languages/translations/id.json b/languages/translations/id.json index cdddc9c84..e9139a37f 100644 --- a/languages/translations/id.json +++ b/languages/translations/id.json @@ -50,7 +50,12 @@ "destination": "Naik ferry menuju {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Anda telah tiba di tujuan ke-{nth}" diff --git a/languages/translations/it.json b/languages/translations/it.json index 2b45bf061..ce498bbb4 100644 --- a/languages/translations/it.json +++ b/languages/translations/it.json @@ -53,7 +53,8 @@ "phrase": { "two linked by distance": "{instruction_one}, poi tra {distance} {instruction_two}", "two linked": "{instruction_one} poi {instruction_two}", - "one in distance": "tra {distance} {instruction_one}" + "one in distance": "tra {distance} {instruction_one}", + "name and ref": "{name} ({ref})" }, "arrive": { "default": { diff --git a/languages/translations/nl.json b/languages/translations/nl.json index 34df7f584..a65c883d0 100644 --- a/languages/translations/nl.json +++ b/languages/translations/nl.json @@ -50,7 +50,12 @@ "destination": "Neem het veer naar {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Je bent gearriveerd op de {nth} bestemming." diff --git a/languages/translations/pl.json b/languages/translations/pl.json index 2eb06dcb5..51f2dc32d 100644 --- a/languages/translations/pl.json +++ b/languages/translations/pl.json @@ -50,7 +50,12 @@ "destination": "Weź prom w kierunku {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Dojechano do miejsca docelowego {nth}" diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json index ab89a1b79..7e7e0d51b 100644 --- a/languages/translations/pt-BR.json +++ b/languages/translations/pt-BR.json @@ -50,7 +50,12 @@ "destination": "Pegue a balsa sentido {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Você chegou ao seu {nth} destino" diff --git a/languages/translations/ru.json b/languages/translations/ru.json index d81ebfa16..ddbdf2abf 100644 --- a/languages/translations/ru.json +++ b/languages/translations/ru.json @@ -50,7 +50,12 @@ "destination": "Погрузитесь на паром в направлении {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one}, затем через {distance} {instruction_two}", + "two linked": "{instruction_one}, затем {instruction_two}", + "one in distance": "Через {distance} {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Вы прибыли в {nth} пункт назначения" @@ -80,14 +85,27 @@ "continue": { "default": { "default": "Двигайтесь {modifier}", - "name": "Двигайтесь {modifier} по {way_name}", - "destination": "Двигайтесь {modifier} в направлении {destination}" + "name": "Продолжите движение {modifier} по {way_name}", + "destination": "Двигайтесь {modifier} в направлении {destination}", + "exit": "Двигайтесь {modifier} по {way_name}" }, "straight": { "default": "Двигайтесь прямо", "name": "Продолжите движение по {way_name}", - "destination": "Продолжите движение в направлении {destination}" + "destination": "Продолжите движение в направлении {destination}", + "distance": "Двигайтесь прямо {distance}", + "namedistance": "Двигайтесь прямо {distance} по {way_name}" + }, + "sharp left": { + "default": "Резко поверните налево", + "name": "Резко поверните налево на {way_name}", + "destination": "Резко поверните налево в направлении {destination}" }, + "sharp right": { + "default": "Резко поверните направо", + "name": "Резко поверните направо на {way_name}", + "destination": "Резко поверните направо в направлении {destination}" + }, "slight left": { "default": "Плавно поверните налево", "name": "Плавно поверните налево на {way_name}", @@ -100,7 +118,7 @@ }, "uturn": { "default": "Развернитесь", - "name": "Развернитесь на {way_name}", + "name": "Развернитесь и продолжите движение по {way_name}", "destination": "Развернитесь в направлении {destination}" } }, diff --git a/languages/translations/sv.json b/languages/translations/sv.json index da1834a66..5052f1804 100644 --- a/languages/translations/sv.json +++ b/languages/translations/sv.json @@ -50,7 +50,12 @@ "destination": "Ta färjan mot {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one}, sedan om {distance}, {instruction_two}", + "two linked": "{instruction_one}, sedan {instruction_two}", + "one in distance": "Om {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Du är framme vid din {nth} destination" diff --git a/languages/translations/uk.json b/languages/translations/uk.json index b6bfe3d2d..967f90780 100644 --- a/languages/translations/uk.json +++ b/languages/translations/uk.json @@ -50,7 +50,12 @@ "destination": "Скористайтесь поромом у напрямку {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Ви прибули у ваш {nth} пункт призначення" diff --git a/languages/translations/vi.json b/languages/translations/vi.json index 9fe182297..84d6901d3 100644 --- a/languages/translations/vi.json +++ b/languages/translations/vi.json @@ -50,7 +50,12 @@ "destination": "Lên phà đi {destination}" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one}, rồi {distance} nữa thì {instruction_two}", + "two linked": "{instruction_one}, rồi {instruction_two}", + "one in distance": "{distance} nữa thì {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "Đến nơi {nth}" @@ -79,28 +84,41 @@ }, "continue": { "default": { - "default": "Chạy tiếp bên {modifier}", - "name": "Chạy tiếp bên {modifier} trên {way_name}", - "destination": "Chạy tiếp bên {modifier} đến {destination}" + "default": "Quẹo {modifier}", + "name": "Quẹo {modifier} để chạy tiếp trên {way_name}", + "destination": "Quẹo {modifier} đến {destination}", + "exit": "Quẹo {modifier} vào {way_name}" }, "straight": { "default": "Chạy thẳng", "name": "Chạy tiếp trên {way_name}", - "destination": "Chạy tiếp đến {destination}" + "destination": "Chạy tiếp đến {destination}", + "distance": "Chạy thẳng cho {distance}", + "namedistance": "Chạy tiếp trên {way_name} cho {distance}" + }, + "sharp left": { + "default": "Quẹo gắt bên trái", + "name": "Quẹo gắt bên trái để chạy tiếp trên {way_name}", + "destination": "Quẹo gắt bên trái đến {destination}" + }, + "sharp right": { + "default": "Quẹo gắt bên phải", + "name": "Quẹo gắt bên phải để chạy tiếp trên {way_name}", + "destination": "Quẹo gắt bên phải đến {destination}" }, "slight left": { "default": "Nghiêng về bên trái", - "name": "Nghiêng về bên trái vào {way_name}", + "name": "Nghiêng về bên trái để chạy tiếp trên {way_name}", "destination": "Nghiêng về bên trái đến {destination}" }, "slight right": { "default": "Nghiêng về bên phải", - "name": "Nghiêng về bên phải vào {way_name}", + "name": "Nghiêng về bên phải để chạy tiếp trên {way_name}", "destination": "Nghiêng về bên phải đến {destination}" }, "uturn": { "default": "Quẹo ngược lại", - "name": "Quẹo ngược lại {way_name}", + "name": "Quẹo ngược lại trên {way_name}", "destination": "Quẹo ngược đến {destination}" } }, @@ -463,4 +481,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json index f4e610955..48b0a3ca0 100644 --- a/languages/translations/zh-Hans.json +++ b/languages/translations/zh-Hans.json @@ -50,7 +50,12 @@ "destination": "乘坐开往{destination}的轮渡" } }, - "phrase": {}, + "phrase": { + "two linked by distance": "{instruction_one} then in {distance} {instruction_two}", + "two linked": "{instruction_one} then {instruction_two}", + "one in distance": "In {distance}, {instruction_one}", + "name and ref": "{name} ({ref})" + }, "arrive": { "default": { "default": "您已经到达您的{nth}个目的地" diff --git a/test/fixtures/v5/continue/left_default.json b/test/fixtures/v5/continue/left_default.json index 4cf9b041a..912c0eaef 100644 --- a/test/fixtures/v5/continue/left_default.json +++ b/test/fixtures/v5/continue/left_default.json @@ -9,7 +9,7 @@ "instructions": { "de": "Links weiterfahren", "en": "Turn left", - "es": "Continúe izquierda", + "es": "Gire a izquierda", "fr": "Continuer à gauche", "id": "Terus kiri", "it": "Continua a sinistra", @@ -19,7 +19,7 @@ "ru": "Двигайтесь налево", "sv": "Fortsätt vänster", "uk": "Рухайтесь ліворуч", - "vi": "Chạy tiếp bên trái", + "vi": "Quẹo trái", "zh-Hans": "继续向左" } } diff --git a/test/fixtures/v5/continue/left_destination.json b/test/fixtures/v5/continue/left_destination.json index 0c142aee8..459c550c5 100644 --- a/test/fixtures/v5/continue/left_destination.json +++ b/test/fixtures/v5/continue/left_destination.json @@ -10,7 +10,7 @@ "instructions": { "de": "Links weiterfahren Richtung Destination 1", "en": "Turn left towards Destination 1", - "es": "Continúe izquierda hacia Destination 1", + "es": "Gire a izquierda hacia Destination 1", "fr": "Continuer à gauche en direction de Destination 1", "id": "Teruskan kiri menuju Destination 1", "it": "Continua a sinistra verso Destination 1", @@ -20,7 +20,7 @@ "ru": "Двигайтесь налево в направлении Destination 1", "sv": "Fortsätt vänster mot Destination 1", "uk": "Рухайтесь ліворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên trái đến Destination 1", + "vi": "Quẹo trái đến Destination 1", "zh-Hans": "继续向左行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/left_exit.json b/test/fixtures/v5/continue/left_exit.json index 1d86319c8..b5ec48cf9 100644 --- a/test/fixtures/v5/continue/left_exit.json +++ b/test/fixtures/v5/continue/left_exit.json @@ -10,7 +10,7 @@ "instructions": { "de": "Links weiterfahren auf Way Name", "en": "Turn left onto Way Name", - "es": "Continúe izquierda en Way Name", + "es": "Gire a izquierda en Way Name", "fr": "Continuer à gauche sur Way Name", "id": "Terus kiri ke Way Name", "it": "Continua a sinistra in Way Name", @@ -20,7 +20,7 @@ "ru": "Двигайтесь налево по Way Name", "sv": "Fortsätt vänster in på Way Name", "uk": "Рухайтесь ліворуч на Way Name", - "vi": "Chạy tiếp bên trái trên Way Name", + "vi": "Quẹo trái vào Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/left_exit_destination.json b/test/fixtures/v5/continue/left_exit_destination.json index 1a15b22a5..15c089502 100644 --- a/test/fixtures/v5/continue/left_exit_destination.json +++ b/test/fixtures/v5/continue/left_exit_destination.json @@ -11,7 +11,7 @@ "instructions": { "de": "Links weiterfahren Richtung Destination 1", "en": "Turn left towards Destination 1", - "es": "Continúe izquierda hacia Destination 1", + "es": "Gire a izquierda hacia Destination 1", "fr": "Continuer à gauche en direction de Destination 1", "id": "Teruskan kiri menuju Destination 1", "it": "Continua a sinistra verso Destination 1", @@ -21,7 +21,7 @@ "ru": "Двигайтесь налево в направлении Destination 1", "sv": "Fortsätt vänster mot Destination 1", "uk": "Рухайтесь ліворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên trái đến Destination 1", + "vi": "Quẹo trái đến Destination 1", "zh-Hans": "继续向左行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/left_name.json b/test/fixtures/v5/continue/left_name.json index ec7646d5f..55c5b98ed 100644 --- a/test/fixtures/v5/continue/left_name.json +++ b/test/fixtures/v5/continue/left_name.json @@ -9,17 +9,17 @@ "instructions": { "de": "Links weiterfahren auf Way Name", "en": "Turn left to stay on Way Name", - "es": "Continúe izquierda en Way Name", + "es": "Turn izquierda to stay on Way Name", "fr": "Continuer à gauche sur Way Name", "id": "Terus kiri ke Way Name", "it": "Continua a sinistra per stare su Way Name", "nl": "Ga links naar Way Name", "pl": "Kontynuuj lewo na Way Name", "pt-BR": "Continue à esquerda em Way Name", - "ru": "Двигайтесь налево по Way Name", + "ru": "Продолжите движение налево по Way Name", "sv": "Fortsätt vänster in på Way Name", "uk": "Рухайтесь ліворуч на Way Name", - "vi": "Chạy tiếp bên trái trên Way Name", + "vi": "Quẹo trái để chạy tiếp trên Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/right_default.json b/test/fixtures/v5/continue/right_default.json index e03a55110..d1ff5c97f 100644 --- a/test/fixtures/v5/continue/right_default.json +++ b/test/fixtures/v5/continue/right_default.json @@ -9,7 +9,7 @@ "instructions": { "de": "Rechts weiterfahren", "en": "Turn right", - "es": "Continúe derecha", + "es": "Gire a derecha", "fr": "Continuer à droite", "id": "Terus kanan", "it": "Continua a destra", @@ -19,7 +19,7 @@ "ru": "Двигайтесь направо", "sv": "Fortsätt höger", "uk": "Рухайтесь праворуч", - "vi": "Chạy tiếp bên phải", + "vi": "Quẹo phải", "zh-Hans": "继续向右" } } diff --git a/test/fixtures/v5/continue/right_destination.json b/test/fixtures/v5/continue/right_destination.json index b668be4ad..b036e6bfb 100644 --- a/test/fixtures/v5/continue/right_destination.json +++ b/test/fixtures/v5/continue/right_destination.json @@ -10,7 +10,7 @@ "instructions": { "de": "Rechts weiterfahren Richtung Destination 1", "en": "Turn right towards Destination 1", - "es": "Continúe derecha hacia Destination 1", + "es": "Gire a derecha hacia Destination 1", "fr": "Continuer à droite en direction de Destination 1", "id": "Teruskan kanan menuju Destination 1", "it": "Continua a destra verso Destination 1", @@ -20,7 +20,7 @@ "ru": "Двигайтесь направо в направлении Destination 1", "sv": "Fortsätt höger mot Destination 1", "uk": "Рухайтесь праворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên phải đến Destination 1", + "vi": "Quẹo phải đến Destination 1", "zh-Hans": "继续向右行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/right_exit.json b/test/fixtures/v5/continue/right_exit.json index d27e5dfc9..879015de2 100644 --- a/test/fixtures/v5/continue/right_exit.json +++ b/test/fixtures/v5/continue/right_exit.json @@ -10,7 +10,7 @@ "instructions": { "de": "Rechts weiterfahren auf Way Name", "en": "Turn right onto Way Name", - "es": "Continúe derecha en Way Name", + "es": "Gire a derecha en Way Name", "fr": "Continuer à droite sur Way Name", "id": "Terus kanan ke Way Name", "it": "Continua a destra in Way Name", @@ -20,7 +20,7 @@ "ru": "Двигайтесь направо по Way Name", "sv": "Fortsätt höger in på Way Name", "uk": "Рухайтесь праворуч на Way Name", - "vi": "Chạy tiếp bên phải trên Way Name", + "vi": "Quẹo phải vào Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/right_exit_destination.json b/test/fixtures/v5/continue/right_exit_destination.json index a8c02c6d8..c1aa31a60 100644 --- a/test/fixtures/v5/continue/right_exit_destination.json +++ b/test/fixtures/v5/continue/right_exit_destination.json @@ -11,7 +11,7 @@ "instructions": { "de": "Rechts weiterfahren Richtung Destination 1", "en": "Turn right towards Destination 1", - "es": "Continúe derecha hacia Destination 1", + "es": "Gire a derecha hacia Destination 1", "fr": "Continuer à droite en direction de Destination 1", "id": "Teruskan kanan menuju Destination 1", "it": "Continua a destra verso Destination 1", @@ -21,7 +21,7 @@ "ru": "Двигайтесь направо в направлении Destination 1", "sv": "Fortsätt höger mot Destination 1", "uk": "Рухайтесь праворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên phải đến Destination 1", + "vi": "Quẹo phải đến Destination 1", "zh-Hans": "继续向右行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/right_name.json b/test/fixtures/v5/continue/right_name.json index dcf047d27..36dcf6af6 100644 --- a/test/fixtures/v5/continue/right_name.json +++ b/test/fixtures/v5/continue/right_name.json @@ -9,17 +9,17 @@ "instructions": { "de": "Rechts weiterfahren auf Way Name", "en": "Turn right to stay on Way Name", - "es": "Continúe derecha en Way Name", + "es": "Turn derecha to stay on Way Name", "fr": "Continuer à droite sur Way Name", "id": "Terus kanan ke Way Name", "it": "Continua a destra per stare su Way Name", "nl": "Ga rechts naar Way Name", "pl": "Kontynuuj prawo na Way Name", "pt-BR": "Continue à direita em Way Name", - "ru": "Двигайтесь направо по Way Name", + "ru": "Продолжите движение направо по Way Name", "sv": "Fortsätt höger in på Way Name", "uk": "Рухайтесь праворуч на Way Name", - "vi": "Chạy tiếp bên phải trên Way Name", + "vi": "Quẹo phải để chạy tiếp trên Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/sharp_left_default.json b/test/fixtures/v5/continue/sharp_left_default.json index 66b12d781..70bfa959c 100644 --- a/test/fixtures/v5/continue/sharp_left_default.json +++ b/test/fixtures/v5/continue/sharp_left_default.json @@ -9,17 +9,17 @@ "instructions": { "de": "Scharf links weiterfahren", "en": "Make a sharp left", - "es": "Continúe cerrada a la izquierda", + "es": "Gire a la izquierda", "fr": "Continuer franchement à gauche", "id": "Terus tajam kiri", "it": "Continua a sinistra", "nl": "Ga linksaf", "pl": "Kontynuuj ostro w lewo", "pt-BR": "Continue acentuadamente à esquerda", - "ru": "Двигайтесь налево", + "ru": "Резко поверните налево", "sv": "Fortsätt vänster", "uk": "Рухайтесь різко ліворуч", - "vi": "Chạy tiếp bên trái gắt", + "vi": "Quẹo gắt bên trái", "zh-Hans": "继续向左" } } diff --git a/test/fixtures/v5/continue/sharp_left_destination.json b/test/fixtures/v5/continue/sharp_left_destination.json index de2252ede..3786226aa 100644 --- a/test/fixtures/v5/continue/sharp_left_destination.json +++ b/test/fixtures/v5/continue/sharp_left_destination.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf links weiterfahren Richtung Destination 1", "en": "Make a sharp left towards Destination 1", - "es": "Continúe cerrada a la izquierda hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer franchement à gauche en direction de Destination 1", "id": "Teruskan tajam kiri menuju Destination 1", "it": "Continua a sinistra verso Destination 1", "nl": "Ga linksaf richting Destination 1", "pl": "Kontynuuj ostro w lewo w kierunku Destination 1", "pt-BR": "Continue acentuadamente à esquerda sentido Destination 1", - "ru": "Двигайтесь налево в направлении Destination 1", + "ru": "Резко поверните налево в направлении Destination 1", "sv": "Fortsätt vänster mot Destination 1", "uk": "Рухайтесь різко ліворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên trái gắt đến Destination 1", + "vi": "Quẹo gắt bên trái đến Destination 1", "zh-Hans": "继续向左行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/sharp_left_exit.json b/test/fixtures/v5/continue/sharp_left_exit.json index cbb71a3a1..bfd2f21f2 100644 --- a/test/fixtures/v5/continue/sharp_left_exit.json +++ b/test/fixtures/v5/continue/sharp_left_exit.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf links weiterfahren auf Way Name", "en": "Make a sharp left to stay on Way Name", - "es": "Continúe cerrada a la izquierda en Way Name", + "es": "Make a sharp left to stay on Way Name", "fr": "Continuer franchement à gauche sur Way Name", "id": "Terus tajam kiri ke Way Name", "it": "Continua a sinistra in Way Name", "nl": "Ga linksaf naar Way Name", "pl": "Kontynuuj ostro w lewo na Way Name", "pt-BR": "Continue acentuadamente à esquerda em Way Name", - "ru": "Двигайтесь налево по Way Name", + "ru": "Резко поверните налево на Way Name", "sv": "Fortsätt vänster in på Way Name", "uk": "Рухайтесь різко ліворуч на Way Name", - "vi": "Chạy tiếp bên trái gắt trên Way Name", + "vi": "Quẹo gắt bên trái để chạy tiếp trên Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/sharp_left_exit_destination.json b/test/fixtures/v5/continue/sharp_left_exit_destination.json index c425a3c65..9b13009be 100644 --- a/test/fixtures/v5/continue/sharp_left_exit_destination.json +++ b/test/fixtures/v5/continue/sharp_left_exit_destination.json @@ -11,17 +11,17 @@ "instructions": { "de": "Scharf links weiterfahren Richtung Destination 1", "en": "Make a sharp left towards Destination 1", - "es": "Continúe cerrada a la izquierda hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer franchement à gauche en direction de Destination 1", "id": "Teruskan tajam kiri menuju Destination 1", "it": "Continua a sinistra verso Destination 1", "nl": "Ga linksaf richting Destination 1", "pl": "Kontynuuj ostro w lewo w kierunku Destination 1", "pt-BR": "Continue acentuadamente à esquerda sentido Destination 1", - "ru": "Двигайтесь налево в направлении Destination 1", + "ru": "Резко поверните налево в направлении Destination 1", "sv": "Fortsätt vänster mot Destination 1", "uk": "Рухайтесь різко ліворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên trái gắt đến Destination 1", + "vi": "Quẹo gắt bên trái đến Destination 1", "zh-Hans": "继续向左行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/sharp_left_name.json b/test/fixtures/v5/continue/sharp_left_name.json index 75f57b507..ea7cf0b69 100644 --- a/test/fixtures/v5/continue/sharp_left_name.json +++ b/test/fixtures/v5/continue/sharp_left_name.json @@ -9,17 +9,17 @@ "instructions": { "de": "Scharf links weiterfahren auf Way Name", "en": "Make a sharp left to stay on Way Name", - "es": "Continúe cerrada a la izquierda en Way Name", + "es": "Make a sharp left to stay on Way Name", "fr": "Continuer franchement à gauche sur Way Name", "id": "Terus tajam kiri ke Way Name", "it": "Continua a sinistra per stare su Way Name", "nl": "Ga linksaf naar Way Name", "pl": "Kontynuuj ostro w lewo na Way Name", "pt-BR": "Continue acentuadamente à esquerda em Way Name", - "ru": "Двигайтесь налево по Way Name", + "ru": "Резко поверните налево на Way Name", "sv": "Fortsätt vänster in på Way Name", "uk": "Рухайтесь різко ліворуч на Way Name", - "vi": "Chạy tiếp bên trái gắt trên Way Name", + "vi": "Quẹo gắt bên trái để chạy tiếp trên Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/sharp_right_default.json b/test/fixtures/v5/continue/sharp_right_default.json index dafafd9ef..513bffe71 100644 --- a/test/fixtures/v5/continue/sharp_right_default.json +++ b/test/fixtures/v5/continue/sharp_right_default.json @@ -9,17 +9,17 @@ "instructions": { "de": "Scharf rechts weiterfahren", "en": "Make a sharp right", - "es": "Continúe cerrada a la derecha", + "es": "Gire a la derecha", "fr": "Continuer franchement à droite", "id": "Terus tajam kanan", "it": "Continua a destra", "nl": "Ga rechtsaf", "pl": "Kontynuuj ostro w prawo", "pt-BR": "Continue acentuadamente à direita", - "ru": "Двигайтесь направо", + "ru": "Резко поверните направо", "sv": "Fortsätt höger", "uk": "Рухайтесь різко праворуч", - "vi": "Chạy tiếp bên phải gắt", + "vi": "Quẹo gắt bên phải", "zh-Hans": "继续向右" } } diff --git a/test/fixtures/v5/continue/sharp_right_destination.json b/test/fixtures/v5/continue/sharp_right_destination.json index 65650d427..b5133b93f 100644 --- a/test/fixtures/v5/continue/sharp_right_destination.json +++ b/test/fixtures/v5/continue/sharp_right_destination.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf rechts weiterfahren Richtung Destination 1", "en": "Make a sharp right towards Destination 1", - "es": "Continúe cerrada a la derecha hacia Destination 1", + "es": "Gire a la derecha hacia Destination 1", "fr": "Continuer franchement à droite en direction de Destination 1", "id": "Teruskan tajam kanan menuju Destination 1", "it": "Continua a destra verso Destination 1", "nl": "Ga rechtsaf richting Destination 1", "pl": "Kontynuuj ostro w prawo w kierunku Destination 1", "pt-BR": "Continue acentuadamente à direita sentido Destination 1", - "ru": "Двигайтесь направо в направлении Destination 1", + "ru": "Резко поверните направо в направлении Destination 1", "sv": "Fortsätt höger mot Destination 1", "uk": "Рухайтесь різко праворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên phải gắt đến Destination 1", + "vi": "Quẹo gắt bên phải đến Destination 1", "zh-Hans": "继续向右行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/sharp_right_exit.json b/test/fixtures/v5/continue/sharp_right_exit.json index debe67929..3d172061d 100644 --- a/test/fixtures/v5/continue/sharp_right_exit.json +++ b/test/fixtures/v5/continue/sharp_right_exit.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf rechts weiterfahren auf Way Name", "en": "Make a sharp right to stay on Way Name", - "es": "Continúe cerrada a la derecha en Way Name", + "es": "Make a sharp right to stay on Way Name", "fr": "Continuer franchement à droite sur Way Name", "id": "Terus tajam kanan ke Way Name", "it": "Continua a destra in Way Name", "nl": "Ga rechtsaf naar Way Name", "pl": "Kontynuuj ostro w prawo na Way Name", "pt-BR": "Continue acentuadamente à direita em Way Name", - "ru": "Двигайтесь направо по Way Name", + "ru": "Резко поверните направо на Way Name", "sv": "Fortsätt höger in på Way Name", "uk": "Рухайтесь різко праворуч на Way Name", - "vi": "Chạy tiếp bên phải gắt trên Way Name", + "vi": "Quẹo gắt bên phải để chạy tiếp trên Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/sharp_right_exit_destination.json b/test/fixtures/v5/continue/sharp_right_exit_destination.json index 63d577c84..981a6ce07 100644 --- a/test/fixtures/v5/continue/sharp_right_exit_destination.json +++ b/test/fixtures/v5/continue/sharp_right_exit_destination.json @@ -11,17 +11,17 @@ "instructions": { "de": "Scharf rechts weiterfahren Richtung Destination 1", "en": "Make a sharp right towards Destination 1", - "es": "Continúe cerrada a la derecha hacia Destination 1", + "es": "Gire a la derecha hacia Destination 1", "fr": "Continuer franchement à droite en direction de Destination 1", "id": "Teruskan tajam kanan menuju Destination 1", "it": "Continua a destra verso Destination 1", "nl": "Ga rechtsaf richting Destination 1", "pl": "Kontynuuj ostro w prawo w kierunku Destination 1", "pt-BR": "Continue acentuadamente à direita sentido Destination 1", - "ru": "Двигайтесь направо в направлении Destination 1", + "ru": "Резко поверните направо в направлении Destination 1", "sv": "Fortsätt höger mot Destination 1", "uk": "Рухайтесь різко праворуч у напрямку Destination 1", - "vi": "Chạy tiếp bên phải gắt đến Destination 1", + "vi": "Quẹo gắt bên phải đến Destination 1", "zh-Hans": "继续向右行驶，前往Destination 1" } } diff --git a/test/fixtures/v5/continue/sharp_right_name.json b/test/fixtures/v5/continue/sharp_right_name.json index 742717d0e..8413a556f 100644 --- a/test/fixtures/v5/continue/sharp_right_name.json +++ b/test/fixtures/v5/continue/sharp_right_name.json @@ -9,17 +9,17 @@ "instructions": { "de": "Scharf rechts weiterfahren auf Way Name", "en": "Make a sharp right to stay on Way Name", - "es": "Continúe cerrada a la derecha en Way Name", + "es": "Make a sharp right to stay on Way Name", "fr": "Continuer franchement à droite sur Way Name", "id": "Terus tajam kanan ke Way Name", "it": "Continua a destra per stare su Way Name", "nl": "Ga rechtsaf naar Way Name", "pl": "Kontynuuj ostro w prawo na Way Name", "pt-BR": "Continue acentuadamente à direita em Way Name", - "ru": "Двигайтесь направо по Way Name", + "ru": "Резко поверните направо на Way Name", "sv": "Fortsätt höger in på Way Name", "uk": "Рухайтесь різко праворуч на Way Name", - "vi": "Chạy tiếp bên phải gắt trên Way Name", + "vi": "Quẹo gắt bên phải để chạy tiếp trên Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/slight_left_default.json b/test/fixtures/v5/continue/slight_left_default.json index 5d2e1d8b6..a20fb3166 100644 --- a/test/fixtures/v5/continue/slight_left_default.json +++ b/test/fixtures/v5/continue/slight_left_default.json @@ -9,7 +9,7 @@ "instructions": { "de": "Leicht links weiter", "en": "Make a slight left", - "es": "Continúe ligeramente a la izquierda", + "es": "Gire a la izquierda", "fr": "Continuer légèrement à gauche", "id": "Tetap agak di kiri", "it": "Continua leggermente a sinistra", diff --git a/test/fixtures/v5/continue/slight_left_destination.json b/test/fixtures/v5/continue/slight_left_destination.json index 1a440660a..0e533cd89 100644 --- a/test/fixtures/v5/continue/slight_left_destination.json +++ b/test/fixtures/v5/continue/slight_left_destination.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht links weiter Richtung Destination 1", "en": "Make a slight left towards Destination 1", - "es": "Continúe ligeramente a la izquierda hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer légèrement à gauche en direction de Destination 1", "id": "Tetap agak di kiri menuju Destination 1", "it": "Continua leggermente a sinistra verso Destination 1", diff --git a/test/fixtures/v5/continue/slight_left_exit.json b/test/fixtures/v5/continue/slight_left_exit.json index 8e0c1ff91..f18579ecd 100644 --- a/test/fixtures/v5/continue/slight_left_exit.json +++ b/test/fixtures/v5/continue/slight_left_exit.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht links weiter auf Way Name", "en": "Make a slight left to stay on Way Name", - "es": "Continúe ligeramente a la izquierda en Way Name", + "es": "Make a slight left to stay on Way Name", "fr": "Continuer légèrement à gauche sur Way Name", "id": "Tetap agak di kiri ke Way Name", "it": "Continua leggermente a sinistra per stare su Way Name", @@ -20,7 +20,7 @@ "ru": "Плавно поверните налево на Way Name", "sv": "Fortsätt åt vänster in på Way Name", "uk": "Рухайтесь плавно ліворуч на Way Name", - "vi": "Nghiêng về bên trái vào Way Name", + "vi": "Nghiêng về bên trái để chạy tiếp trên Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/slight_left_exit_destination.json b/test/fixtures/v5/continue/slight_left_exit_destination.json index 60fc22fe8..8bd985fbd 100644 --- a/test/fixtures/v5/continue/slight_left_exit_destination.json +++ b/test/fixtures/v5/continue/slight_left_exit_destination.json @@ -11,7 +11,7 @@ "instructions": { "de": "Leicht links weiter Richtung Destination 1", "en": "Make a slight left towards Destination 1", - "es": "Continúe ligeramente a la izquierda hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer légèrement à gauche en direction de Destination 1", "id": "Tetap agak di kiri menuju Destination 1", "it": "Continua leggermente a sinistra verso Destination 1", diff --git a/test/fixtures/v5/continue/slight_left_name.json b/test/fixtures/v5/continue/slight_left_name.json index 6e697cfe7..1a0322e8e 100644 --- a/test/fixtures/v5/continue/slight_left_name.json +++ b/test/fixtures/v5/continue/slight_left_name.json @@ -9,7 +9,7 @@ "instructions": { "de": "Leicht links weiter auf Way Name", "en": "Make a slight left to stay on Way Name", - "es": "Continúe ligeramente a la izquierda en Way Name", + "es": "Make a slight left to stay on Way Name", "fr": "Continuer légèrement à gauche sur Way Name", "id": "Tetap agak di kiri ke Way Name", "it": "Continua leggermente a sinistra per stare su Way Name", @@ -19,7 +19,7 @@ "ru": "Плавно поверните налево на Way Name", "sv": "Fortsätt åt vänster in på Way Name", "uk": "Рухайтесь плавно ліворуч на Way Name", - "vi": "Nghiêng về bên trái vào Way Name", + "vi": "Nghiêng về bên trái để chạy tiếp trên Way Name", "zh-Hans": "继续向左，上Way Name" } } diff --git a/test/fixtures/v5/continue/slight_right_default.json b/test/fixtures/v5/continue/slight_right_default.json index 94b714fa5..f3e386c70 100644 --- a/test/fixtures/v5/continue/slight_right_default.json +++ b/test/fixtures/v5/continue/slight_right_default.json @@ -9,7 +9,7 @@ "instructions": { "de": "Leicht rechts weiter", "en": "Make a slight right", - "es": "Continúe ligeramente a la derecha", + "es": "Gire a la izquierda", "fr": "Continuer légèrement à droite", "id": "Tetap agak di kanan", "it": "Continua leggermente a destra", diff --git a/test/fixtures/v5/continue/slight_right_destination.json b/test/fixtures/v5/continue/slight_right_destination.json index bfcd75b38..ee0e4bdfd 100644 --- a/test/fixtures/v5/continue/slight_right_destination.json +++ b/test/fixtures/v5/continue/slight_right_destination.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht rechts weiter Richtung Destination 1", "en": "Make a slight right towards Destination 1", - "es": "Continúe ligeramente a la derecha hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer légèrement à droite en direction de Destination 1", "id": "Tetap agak di kanan menuju Destination 1", "it": "Continua leggermente a destra verso Destination 1", diff --git a/test/fixtures/v5/continue/slight_right_exit.json b/test/fixtures/v5/continue/slight_right_exit.json index 24693084f..d1fda9bb5 100644 --- a/test/fixtures/v5/continue/slight_right_exit.json +++ b/test/fixtures/v5/continue/slight_right_exit.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht rechts weiter auf Way Name", "en": "Make a slight right to stay on Way Name", - "es": "Continúe ligeramente a la derecha en Way Name", + "es": "Make a slight right to stay on Way Name", "fr": "Continuer légèrement à droite sur Way Name", "id": "Tetap agak di kanan ke Way Name", "it": "Continua leggermente a destra per stare su Way Name", @@ -20,7 +20,7 @@ "ru": "Плавно поверните направо на Way Name", "sv": "Fortsätt åt höger in på Way Name", "uk": "Рухайтесь плавно праворуч на Way Name", - "vi": "Nghiêng về bên phải vào Way Name", + "vi": "Nghiêng về bên phải để chạy tiếp trên Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/slight_right_exit_destination.json b/test/fixtures/v5/continue/slight_right_exit_destination.json index 58f6f2912..cf45232b6 100644 --- a/test/fixtures/v5/continue/slight_right_exit_destination.json +++ b/test/fixtures/v5/continue/slight_right_exit_destination.json @@ -11,7 +11,7 @@ "instructions": { "de": "Leicht rechts weiter Richtung Destination 1", "en": "Make a slight right towards Destination 1", - "es": "Continúe ligeramente a la derecha hacia Destination 1", + "es": "Gire a la izquierda hacia Destination 1", "fr": "Continuer légèrement à droite en direction de Destination 1", "id": "Tetap agak di kanan menuju Destination 1", "it": "Continua leggermente a destra verso Destination 1", diff --git a/test/fixtures/v5/continue/slight_right_name.json b/test/fixtures/v5/continue/slight_right_name.json index b9e77a9d1..70bb0e36d 100644 --- a/test/fixtures/v5/continue/slight_right_name.json +++ b/test/fixtures/v5/continue/slight_right_name.json @@ -9,7 +9,7 @@ "instructions": { "de": "Leicht rechts weiter auf Way Name", "en": "Make a slight right to stay on Way Name", - "es": "Continúe ligeramente a la derecha en Way Name", + "es": "Make a slight right to stay on Way Name", "fr": "Continuer légèrement à droite sur Way Name", "id": "Tetap agak di kanan ke Way Name", "it": "Continua leggermente a destra per stare su Way Name", @@ -19,7 +19,7 @@ "ru": "Плавно поверните направо на Way Name", "sv": "Fortsätt åt höger in på Way Name", "uk": "Рухайтесь плавно праворуч на Way Name", - "vi": "Nghiêng về bên phải vào Way Name", + "vi": "Nghiêng về bên phải để chạy tiếp trên Way Name", "zh-Hans": "继续向右，上Way Name" } } diff --git a/test/fixtures/v5/continue/straight_exit.json b/test/fixtures/v5/continue/straight_exit.json index fb8c2545c..52c4ec264 100644 --- a/test/fixtures/v5/continue/straight_exit.json +++ b/test/fixtures/v5/continue/straight_exit.json @@ -10,7 +10,7 @@ "instructions": { "de": "Geradeaus weiterfahren auf Way Name", "en": "Continue straight to stay on Way Name", - "es": "Continúe en Way Name", + "es": "Continue straight to stay on Way Name", "fr": "Continuer tout droit sur Way Name", "id": "Terus ke Way Name", "it": "Continua dritto per stare su Way Name", diff --git a/test/fixtures/v5/continue/straight_name.json b/test/fixtures/v5/continue/straight_name.json index 08384dc85..343ec5909 100644 --- a/test/fixtures/v5/continue/straight_name.json +++ b/test/fixtures/v5/continue/straight_name.json @@ -9,7 +9,7 @@ "instructions": { "de": "Geradeaus weiterfahren auf Way Name", "en": "Continue straight to stay on Way Name", - "es": "Continúe en Way Name", + "es": "Continue straight to stay on Way Name", "fr": "Continuer tout droit sur Way Name", "id": "Terus ke Way Name", "it": "Continua dritto per stare su Way Name", diff --git a/test/fixtures/v5/continue/uturn_exit.json b/test/fixtures/v5/continue/uturn_exit.json index c9f4d10b1..0e075ff76 100644 --- a/test/fixtures/v5/continue/uturn_exit.json +++ b/test/fixtures/v5/continue/uturn_exit.json @@ -10,17 +10,17 @@ "instructions": { "de": "180°-Wendung auf Way Name", "en": "Make a U-turn and continue on Way Name", - "es": "Haz un cambio de sentido en Way Name", + "es": "Haz un cambio de sentido y continúe en Way Name", "fr": "Faire demi-tour sur Way Name", "id": "Putar balik ke arah Way Name", "it": "Fai un inversione ad U poi continua su Way Name", "nl": "Keer om naar Way Name", "pl": "Zawróć na Way Name", "pt-BR": "Faça o retorno em Way Name", - "ru": "Развернитесь на Way Name", + "ru": "Развернитесь и продолжите движение по Way Name", "sv": "Gör en U-sväng in på Way Name", "uk": "Здійсніть розворот на Way Name", - "vi": "Quẹo ngược lại Way Name", + "vi": "Quẹo ngược lại trên Way Name", "zh-Hans": "调头上Way Name" } } diff --git a/test/fixtures/v5/continue/uturn_name.json b/test/fixtures/v5/continue/uturn_name.json index cc89ae54e..25ab60c33 100644 --- a/test/fixtures/v5/continue/uturn_name.json +++ b/test/fixtures/v5/continue/uturn_name.json @@ -9,17 +9,17 @@ "instructions": { "de": "180°-Wendung auf Way Name", "en": "Make a U-turn and continue on Way Name", - "es": "Haz un cambio de sentido en Way Name", + "es": "Haz un cambio de sentido y continúe en Way Name", "fr": "Faire demi-tour sur Way Name", "id": "Putar balik ke arah Way Name", "it": "Fai un inversione ad U poi continua su Way Name", "nl": "Keer om naar Way Name", "pl": "Zawróć na Way Name", "pt-BR": "Faça o retorno em Way Name", - "ru": "Развернитесь на Way Name", + "ru": "Развернитесь и продолжите движение по Way Name", "sv": "Gör en U-sväng in på Way Name", "uk": "Здійсніть розворот на Way Name", - "vi": "Quẹo ngược lại Way Name", + "vi": "Quẹo ngược lại trên Way Name", "zh-Hans": "调头上Way Name" } } diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_left.json index b9683120d..0f20edc84 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_left.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Links weiterfahren auf Cool highway", "en": "Turn left to stay on Cool highway", - "es": "Continúe izquierda en Cool highway", + "es": "Turn izquierda to stay on Cool highway", "fr": "Continuer à gauche sur Cool highway", "id": "Terus kiri ke Cool highway", "it": "Continua a sinistra per stare su Cool highway", "nl": "Ga links naar Cool highway", "pl": "Kontynuuj lewo na Cool highway", "pt-BR": "Continue à esquerda em Cool highway", - "ru": "Двигайтесь налево по Cool highway", + "ru": "Продолжите движение налево по Cool highway", "sv": "Fortsätt vänster in på Cool highway", "uk": "Рухайтесь ліворуч на Cool highway", - "vi": "Chạy tiếp bên trái trên Cool highway", + "vi": "Quẹo trái để chạy tiếp trên Cool highway", "zh-Hans": "继续向左，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_right.json index 0d461321c..dcbae398b 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_right.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Rechts weiterfahren auf Cool highway", "en": "Turn right to stay on Cool highway", - "es": "Continúe derecha en Cool highway", + "es": "Turn derecha to stay on Cool highway", "fr": "Continuer à droite sur Cool highway", "id": "Terus kanan ke Cool highway", "it": "Continua a destra per stare su Cool highway", "nl": "Ga rechts naar Cool highway", "pl": "Kontynuuj prawo na Cool highway", "pt-BR": "Continue à direita em Cool highway", - "ru": "Двигайтесь направо по Cool highway", + "ru": "Продолжите движение направо по Cool highway", "sv": "Fortsätt höger in på Cool highway", "uk": "Рухайтесь праворуч на Cool highway", - "vi": "Chạy tiếp bên phải trên Cool highway", + "vi": "Quẹo phải để chạy tiếp trên Cool highway", "zh-Hans": "继续向右，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json index efab9155e..46a507b46 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf links weiterfahren auf Cool highway", "en": "Make a sharp left to stay on Cool highway", - "es": "Continúe cerrada a la izquierda en Cool highway", + "es": "Make a sharp left to stay on Cool highway", "fr": "Continuer franchement à gauche sur Cool highway", "id": "Terus tajam kiri ke Cool highway", "it": "Continua a sinistra per stare su Cool highway", "nl": "Ga linksaf naar Cool highway", "pl": "Kontynuuj ostro w lewo na Cool highway", "pt-BR": "Continue acentuadamente à esquerda em Cool highway", - "ru": "Двигайтесь налево по Cool highway", + "ru": "Резко поверните налево на Cool highway", "sv": "Fortsätt vänster in på Cool highway", "uk": "Рухайтесь різко ліворуч на Cool highway", - "vi": "Chạy tiếp bên trái gắt trên Cool highway", + "vi": "Quẹo gắt bên trái để chạy tiếp trên Cool highway", "zh-Hans": "继续向左，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json index 7398ac528..713c84b56 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_sharp right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf rechts weiterfahren auf Cool highway", "en": "Make a sharp right to stay on Cool highway", - "es": "Continúe cerrada a la derecha en Cool highway", + "es": "Make a sharp right to stay on Cool highway", "fr": "Continuer franchement à droite sur Cool highway", "id": "Terus tajam kanan ke Cool highway", "it": "Continua a destra per stare su Cool highway", "nl": "Ga rechtsaf naar Cool highway", "pl": "Kontynuuj ostro w prawo na Cool highway", "pt-BR": "Continue acentuadamente à direita em Cool highway", - "ru": "Двигайтесь направо по Cool highway", + "ru": "Резко поверните направо на Cool highway", "sv": "Fortsätt höger in på Cool highway", "uk": "Рухайтесь різко праворуч на Cool highway", - "vi": "Chạy tiếp bên phải gắt trên Cool highway", + "vi": "Quẹo gắt bên phải để chạy tiếp trên Cool highway", "zh-Hans": "继续向右，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json b/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json index 5c0843e63..042cee52b 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_slight left.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht links weiter auf Cool highway", "en": "Make a slight left to stay on Cool highway", - "es": "Continúe ligeramente a la izquierda en Cool highway", + "es": "Make a slight left to stay on Cool highway", "fr": "Continuer légèrement à gauche sur Cool highway", "id": "Tetap agak di kiri ke Cool highway", "it": "Continua leggermente a sinistra per stare su Cool highway", @@ -20,7 +20,7 @@ "ru": "Плавно поверните налево на Cool highway", "sv": "Fortsätt åt vänster in på Cool highway", "uk": "Рухайтесь плавно ліворуч на Cool highway", - "vi": "Nghiêng về bên trái vào Cool highway", + "vi": "Nghiêng về bên trái để chạy tiếp trên Cool highway", "zh-Hans": "继续向左，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json b/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json index 83ad60250..f3f908b02 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_slight right.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht rechts weiter auf Cool highway", "en": "Make a slight right to stay on Cool highway", - "es": "Continúe ligeramente a la derecha en Cool highway", + "es": "Make a slight right to stay on Cool highway", "fr": "Continuer légèrement à droite sur Cool highway", "id": "Tetap agak di kanan ke Cool highway", "it": "Continua leggermente a destra per stare su Cool highway", @@ -20,7 +20,7 @@ "ru": "Плавно поверните направо на Cool highway", "sv": "Fortsätt åt höger in på Cool highway", "uk": "Рухайтесь плавно праворуч на Cool highway", - "vi": "Nghiêng về bên phải vào Cool highway", + "vi": "Nghiêng về bên phải để chạy tiếp trên Cool highway", "zh-Hans": "继续向右，上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_straight.json b/test/fixtures/v5/other/motorway_ref_has_no_number_straight.json index 9d070e2df..c1e727695 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_straight.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_straight.json @@ -10,7 +10,7 @@ "instructions": { "de": "Geradeaus weiterfahren auf Cool highway", "en": "Continue straight to stay on Cool highway", - "es": "Continúe en Cool highway", + "es": "Continue straight to stay on Cool highway", "fr": "Continuer tout droit sur Cool highway", "id": "Terus ke Cool highway", "it": "Continua dritto per stare su Cool highway", diff --git a/test/fixtures/v5/other/motorway_ref_has_no_number_uturn.json b/test/fixtures/v5/other/motorway_ref_has_no_number_uturn.json index c6fcc8c6c..6c1e6f54b 100644 --- a/test/fixtures/v5/other/motorway_ref_has_no_number_uturn.json +++ b/test/fixtures/v5/other/motorway_ref_has_no_number_uturn.json @@ -10,17 +10,17 @@ "instructions": { "de": "180°-Wendung auf Cool highway", "en": "Make a U-turn and continue on Cool highway", - "es": "Haz un cambio de sentido en Cool highway", + "es": "Haz un cambio de sentido y continúe en Cool highway", "fr": "Faire demi-tour sur Cool highway", "id": "Putar balik ke arah Cool highway", "it": "Fai un inversione ad U poi continua su Cool highway", "nl": "Keer om naar Cool highway", "pl": "Zawróć na Cool highway", "pt-BR": "Faça o retorno em Cool highway", - "ru": "Развернитесь на Cool highway", + "ru": "Развернитесь и продолжите движение по Cool highway", "sv": "Gör en U-sväng in på Cool highway", "uk": "Здійсніть розворот на Cool highway", - "vi": "Quẹo ngược lại Cool highway", + "vi": "Quẹo ngược lại trên Cool highway", "zh-Hans": "调头上Cool highway" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_left.json b/test/fixtures/v5/other/motorway_ref_has_number_left.json index 59c3d9fd0..45edc5591 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_left.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Links weiterfahren auf Ref1", "en": "Turn left to stay on Ref1", - "es": "Continúe izquierda en Ref1", + "es": "Turn izquierda to stay on Ref1", "fr": "Continuer à gauche sur Ref1", "id": "Terus kiri ke Ref1", "it": "Continua a sinistra per stare su Ref1", "nl": "Ga links naar Ref1", "pl": "Kontynuuj lewo na Ref1", "pt-BR": "Continue à esquerda em Ref1", - "ru": "Двигайтесь налево по Ref1", + "ru": "Продолжите движение налево по Ref1", "sv": "Fortsätt vänster in på Ref1", "uk": "Рухайтесь ліворуч на Ref1", - "vi": "Chạy tiếp bên trái trên Ref1", + "vi": "Quẹo trái để chạy tiếp trên Ref1", "zh-Hans": "继续向左，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_right.json b/test/fixtures/v5/other/motorway_ref_has_number_right.json index 676cea4c3..09e8dd3f7 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_right.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Rechts weiterfahren auf Ref1", "en": "Turn right to stay on Ref1", - "es": "Continúe derecha en Ref1", + "es": "Turn derecha to stay on Ref1", "fr": "Continuer à droite sur Ref1", "id": "Terus kanan ke Ref1", "it": "Continua a destra per stare su Ref1", "nl": "Ga rechts naar Ref1", "pl": "Kontynuuj prawo na Ref1", "pt-BR": "Continue à direita em Ref1", - "ru": "Двигайтесь направо по Ref1", + "ru": "Продолжите движение направо по Ref1", "sv": "Fortsätt höger in på Ref1", "uk": "Рухайтесь праворуч на Ref1", - "vi": "Chạy tiếp bên phải trên Ref1", + "vi": "Quẹo phải để chạy tiếp trên Ref1", "zh-Hans": "继续向右，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_sharp left.json b/test/fixtures/v5/other/motorway_ref_has_number_sharp left.json index d446aee87..1dacbacef 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_sharp left.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_sharp left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf links weiterfahren auf Ref1", "en": "Make a sharp left to stay on Ref1", - "es": "Continúe cerrada a la izquierda en Ref1", + "es": "Make a sharp left to stay on Ref1", "fr": "Continuer franchement à gauche sur Ref1", "id": "Terus tajam kiri ke Ref1", "it": "Continua a sinistra per stare su Ref1", "nl": "Ga linksaf naar Ref1", "pl": "Kontynuuj ostro w lewo na Ref1", "pt-BR": "Continue acentuadamente à esquerda em Ref1", - "ru": "Двигайтесь налево по Ref1", + "ru": "Резко поверните налево на Ref1", "sv": "Fortsätt vänster in på Ref1", "uk": "Рухайтесь різко ліворуч на Ref1", - "vi": "Chạy tiếp bên trái gắt trên Ref1", + "vi": "Quẹo gắt bên trái để chạy tiếp trên Ref1", "zh-Hans": "继续向左，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_sharp right.json b/test/fixtures/v5/other/motorway_ref_has_number_sharp right.json index cdd1021f1..cc1112078 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_sharp right.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_sharp right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf rechts weiterfahren auf Ref1", "en": "Make a sharp right to stay on Ref1", - "es": "Continúe cerrada a la derecha en Ref1", + "es": "Make a sharp right to stay on Ref1", "fr": "Continuer franchement à droite sur Ref1", "id": "Terus tajam kanan ke Ref1", "it": "Continua a destra per stare su Ref1", "nl": "Ga rechtsaf naar Ref1", "pl": "Kontynuuj ostro w prawo na Ref1", "pt-BR": "Continue acentuadamente à direita em Ref1", - "ru": "Двигайтесь направо по Ref1", + "ru": "Резко поверните направо на Ref1", "sv": "Fortsätt höger in på Ref1", "uk": "Рухайтесь різко праворуч на Ref1", - "vi": "Chạy tiếp bên phải gắt trên Ref1", + "vi": "Quẹo gắt bên phải để chạy tiếp trên Ref1", "zh-Hans": "继续向右，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_slight left.json b/test/fixtures/v5/other/motorway_ref_has_number_slight left.json index 8429f4974..4af498578 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_slight left.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_slight left.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht links weiter auf Ref1", "en": "Make a slight left to stay on Ref1", - "es": "Continúe ligeramente a la izquierda en Ref1", + "es": "Make a slight left to stay on Ref1", "fr": "Continuer légèrement à gauche sur Ref1", "id": "Tetap agak di kiri ke Ref1", "it": "Continua leggermente a sinistra per stare su Ref1", @@ -20,7 +20,7 @@ "ru": "Плавно поверните налево на Ref1", "sv": "Fortsätt åt vänster in på Ref1", "uk": "Рухайтесь плавно ліворуч на Ref1", - "vi": "Nghiêng về bên trái vào Ref1", + "vi": "Nghiêng về bên trái để chạy tiếp trên Ref1", "zh-Hans": "继续向左，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_slight right.json b/test/fixtures/v5/other/motorway_ref_has_number_slight right.json index 770697730..fc17de2ce 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_slight right.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_slight right.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht rechts weiter auf Ref1", "en": "Make a slight right to stay on Ref1", - "es": "Continúe ligeramente a la derecha en Ref1", + "es": "Make a slight right to stay on Ref1", "fr": "Continuer légèrement à droite sur Ref1", "id": "Tetap agak di kanan ke Ref1", "it": "Continua leggermente a destra per stare su Ref1", @@ -20,7 +20,7 @@ "ru": "Плавно поверните направо на Ref1", "sv": "Fortsätt åt höger in på Ref1", "uk": "Рухайтесь плавно праворуч на Ref1", - "vi": "Nghiêng về bên phải vào Ref1", + "vi": "Nghiêng về bên phải để chạy tiếp trên Ref1", "zh-Hans": "继续向右，上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/motorway_ref_has_number_straight.json b/test/fixtures/v5/other/motorway_ref_has_number_straight.json index 0a695a7aa..911451d95 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_straight.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_straight.json @@ -10,7 +10,7 @@ "instructions": { "de": "Geradeaus weiterfahren auf Ref1", "en": "Continue straight to stay on Ref1", - "es": "Continúe en Ref1", + "es": "Continue straight to stay on Ref1", "fr": "Continuer tout droit sur Ref1", "id": "Terus ke Ref1", "it": "Continua dritto per stare su Ref1", diff --git a/test/fixtures/v5/other/motorway_ref_has_number_uturn.json b/test/fixtures/v5/other/motorway_ref_has_number_uturn.json index 3eff30468..c176bcee5 100644 --- a/test/fixtures/v5/other/motorway_ref_has_number_uturn.json +++ b/test/fixtures/v5/other/motorway_ref_has_number_uturn.json @@ -10,17 +10,17 @@ "instructions": { "de": "180°-Wendung auf Ref1", "en": "Make a U-turn and continue on Ref1", - "es": "Haz un cambio de sentido en Ref1", + "es": "Haz un cambio de sentido y continúe en Ref1", "fr": "Faire demi-tour sur Ref1", "id": "Putar balik ke arah Ref1", "it": "Fai un inversione ad U poi continua su Ref1", "nl": "Keer om naar Ref1", "pl": "Zawróć na Ref1", "pt-BR": "Faça o retorno em Ref1", - "ru": "Развернитесь на Ref1", + "ru": "Развернитесь и продолжите движение по Ref1", "sv": "Gör en U-sväng in på Ref1", "uk": "Здійсніть розворот на Ref1", - "vi": "Quẹo ngược lại Ref1", + "vi": "Quẹo ngược lại trên Ref1", "zh-Hans": "调头上Ref1" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_left.json b/test/fixtures/v5/other/way_name_class_ferry_left.json index b388c1264..7a3098557 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_left.json +++ b/test/fixtures/v5/other/way_name_class_ferry_left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Links weiterfahren auf Cool highway (Ref1)", "en": "Turn left to stay on Cool highway (Ref1)", - "es": "Continúe izquierda en Cool highway (Ref1)", + "es": "Turn izquierda to stay on Cool highway (Ref1)", "fr": "Continuer à gauche sur Cool highway (Ref1)", "id": "Terus kiri ke Cool highway (Ref1)", "it": "Continua a sinistra per stare su Cool highway (Ref1)", "nl": "Ga links naar Cool highway (Ref1)", "pl": "Kontynuuj lewo na Cool highway (Ref1)", "pt-BR": "Continue à esquerda em Cool highway (Ref1)", - "ru": "Двигайтесь налево по Cool highway (Ref1)", + "ru": "Продолжите движение налево по Cool highway (Ref1)", "sv": "Fortsätt vänster in på Cool highway (Ref1)", "uk": "Рухайтесь ліворуч на Cool highway (Ref1)", - "vi": "Chạy tiếp bên trái trên Cool highway (Ref1)", + "vi": "Quẹo trái để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向左，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_right.json b/test/fixtures/v5/other/way_name_class_ferry_right.json index 88faf1e71..319e912da 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_right.json +++ b/test/fixtures/v5/other/way_name_class_ferry_right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Rechts weiterfahren auf Cool highway (Ref1)", "en": "Turn right to stay on Cool highway (Ref1)", - "es": "Continúe derecha en Cool highway (Ref1)", + "es": "Turn derecha to stay on Cool highway (Ref1)", "fr": "Continuer à droite sur Cool highway (Ref1)", "id": "Terus kanan ke Cool highway (Ref1)", "it": "Continua a destra per stare su Cool highway (Ref1)", "nl": "Ga rechts naar Cool highway (Ref1)", "pl": "Kontynuuj prawo na Cool highway (Ref1)", "pt-BR": "Continue à direita em Cool highway (Ref1)", - "ru": "Двигайтесь направо по Cool highway (Ref1)", + "ru": "Продолжите движение направо по Cool highway (Ref1)", "sv": "Fortsätt höger in på Cool highway (Ref1)", "uk": "Рухайтесь праворуч на Cool highway (Ref1)", - "vi": "Chạy tiếp bên phải trên Cool highway (Ref1)", + "vi": "Quẹo phải để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向右，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_sharp left.json b/test/fixtures/v5/other/way_name_class_ferry_sharp left.json index e89df95b1..da2f71e6e 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_sharp left.json +++ b/test/fixtures/v5/other/way_name_class_ferry_sharp left.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf links weiterfahren auf Cool highway (Ref1)", "en": "Make a sharp left to stay on Cool highway (Ref1)", - "es": "Continúe cerrada a la izquierda en Cool highway (Ref1)", + "es": "Make a sharp left to stay on Cool highway (Ref1)", "fr": "Continuer franchement à gauche sur Cool highway (Ref1)", "id": "Terus tajam kiri ke Cool highway (Ref1)", "it": "Continua a sinistra per stare su Cool highway (Ref1)", "nl": "Ga linksaf naar Cool highway (Ref1)", "pl": "Kontynuuj ostro w lewo na Cool highway (Ref1)", "pt-BR": "Continue acentuadamente à esquerda em Cool highway (Ref1)", - "ru": "Двигайтесь налево по Cool highway (Ref1)", + "ru": "Резко поверните налево на Cool highway (Ref1)", "sv": "Fortsätt vänster in på Cool highway (Ref1)", "uk": "Рухайтесь різко ліворуч на Cool highway (Ref1)", - "vi": "Chạy tiếp bên trái gắt trên Cool highway (Ref1)", + "vi": "Quẹo gắt bên trái để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向左，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_sharp right.json b/test/fixtures/v5/other/way_name_class_ferry_sharp right.json index 489e614e4..06ea27c3b 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_sharp right.json +++ b/test/fixtures/v5/other/way_name_class_ferry_sharp right.json @@ -10,17 +10,17 @@ "instructions": { "de": "Scharf rechts weiterfahren auf Cool highway (Ref1)", "en": "Make a sharp right to stay on Cool highway (Ref1)", - "es": "Continúe cerrada a la derecha en Cool highway (Ref1)", + "es": "Make a sharp right to stay on Cool highway (Ref1)", "fr": "Continuer franchement à droite sur Cool highway (Ref1)", "id": "Terus tajam kanan ke Cool highway (Ref1)", "it": "Continua a destra per stare su Cool highway (Ref1)", "nl": "Ga rechtsaf naar Cool highway (Ref1)", "pl": "Kontynuuj ostro w prawo na Cool highway (Ref1)", "pt-BR": "Continue acentuadamente à direita em Cool highway (Ref1)", - "ru": "Двигайтесь направо по Cool highway (Ref1)", + "ru": "Резко поверните направо на Cool highway (Ref1)", "sv": "Fortsätt höger in på Cool highway (Ref1)", "uk": "Рухайтесь різко праворуч на Cool highway (Ref1)", - "vi": "Chạy tiếp bên phải gắt trên Cool highway (Ref1)", + "vi": "Quẹo gắt bên phải để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向右，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_slight left.json b/test/fixtures/v5/other/way_name_class_ferry_slight left.json index d0c5759a8..a56a3dc03 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_slight left.json +++ b/test/fixtures/v5/other/way_name_class_ferry_slight left.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht links weiter auf Cool highway (Ref1)", "en": "Make a slight left to stay on Cool highway (Ref1)", - "es": "Continúe ligeramente a la izquierda en Cool highway (Ref1)", + "es": "Make a slight left to stay on Cool highway (Ref1)", "fr": "Continuer légèrement à gauche sur Cool highway (Ref1)", "id": "Tetap agak di kiri ke Cool highway (Ref1)", "it": "Continua leggermente a sinistra per stare su Cool highway (Ref1)", @@ -20,7 +20,7 @@ "ru": "Плавно поверните налево на Cool highway (Ref1)", "sv": "Fortsätt åt vänster in på Cool highway (Ref1)", "uk": "Рухайтесь плавно ліворуч на Cool highway (Ref1)", - "vi": "Nghiêng về bên trái vào Cool highway (Ref1)", + "vi": "Nghiêng về bên trái để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向左，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_slight right.json b/test/fixtures/v5/other/way_name_class_ferry_slight right.json index 5b1671748..0ebd84b7a 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_slight right.json +++ b/test/fixtures/v5/other/way_name_class_ferry_slight right.json @@ -10,7 +10,7 @@ "instructions": { "de": "Leicht rechts weiter auf Cool highway (Ref1)", "en": "Make a slight right to stay on Cool highway (Ref1)", - "es": "Continúe ligeramente a la derecha en Cool highway (Ref1)", + "es": "Make a slight right to stay on Cool highway (Ref1)", "fr": "Continuer légèrement à droite sur Cool highway (Ref1)", "id": "Tetap agak di kanan ke Cool highway (Ref1)", "it": "Continua leggermente a destra per stare su Cool highway (Ref1)", @@ -20,7 +20,7 @@ "ru": "Плавно поверните направо на Cool highway (Ref1)", "sv": "Fortsätt åt höger in på Cool highway (Ref1)", "uk": "Рухайтесь плавно праворуч на Cool highway (Ref1)", - "vi": "Nghiêng về bên phải vào Cool highway (Ref1)", + "vi": "Nghiêng về bên phải để chạy tiếp trên Cool highway (Ref1)", "zh-Hans": "继续向右，上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/other/way_name_class_ferry_straight.json b/test/fixtures/v5/other/way_name_class_ferry_straight.json index 29ff158e6..03077cad5 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_straight.json +++ b/test/fixtures/v5/other/way_name_class_ferry_straight.json @@ -10,7 +10,7 @@ "instructions": { "de": "Geradeaus weiterfahren auf Cool highway (Ref1)", "en": "Continue straight to stay on Cool highway (Ref1)", - "es": "Continúe en Cool highway (Ref1)", + "es": "Continue straight to stay on Cool highway (Ref1)", "fr": "Continuer tout droit sur Cool highway (Ref1)", "id": "Terus ke Cool highway (Ref1)", "it": "Continua dritto per stare su Cool highway (Ref1)", diff --git a/test/fixtures/v5/other/way_name_class_ferry_uturn.json b/test/fixtures/v5/other/way_name_class_ferry_uturn.json index a0a3f6f4c..2b0069684 100644 --- a/test/fixtures/v5/other/way_name_class_ferry_uturn.json +++ b/test/fixtures/v5/other/way_name_class_ferry_uturn.json @@ -10,17 +10,17 @@ "instructions": { "de": "180°-Wendung auf Cool highway (Ref1)", "en": "Make a U-turn and continue on Cool highway (Ref1)", - "es": "Haz un cambio de sentido en Cool highway (Ref1)", + "es": "Haz un cambio de sentido y continúe en Cool highway (Ref1)", "fr": "Faire demi-tour sur Cool highway (Ref1)", "id": "Putar balik ke arah Cool highway (Ref1)", "it": "Fai un inversione ad U poi continua su Cool highway (Ref1)", "nl": "Keer om naar Cool highway (Ref1)", "pl": "Zawróć na Cool highway (Ref1)", "pt-BR": "Faça o retorno em Cool highway (Ref1)", - "ru": "Развернитесь на Cool highway (Ref1)", + "ru": "Развернитесь и продолжите движение по Cool highway (Ref1)", "sv": "Gör en U-sväng in på Cool highway (Ref1)", "uk": "Здійсніть розворот на Cool highway (Ref1)", - "vi": "Quẹo ngược lại Cool highway (Ref1)", + "vi": "Quẹo ngược lại trên Cool highway (Ref1)", "zh-Hans": "调头上Cool highway (Ref1)" }, "options": { diff --git a/test/fixtures/v5/phrase/one_in_distance.json b/test/fixtures/v5/phrase/one_in_distance.json new file mode 100644 index 000000000..19e2da5e0 --- /dev/null +++ b/test/fixtures/v5/phrase/one_in_distance.json @@ -0,0 +1,22 @@ +{ + "options": { + "instruction_one": "Do something", + "distance": "0 units" + }, + "phrases": { + "de": "In 0 units, Do something", + "en": "In 0 units, Do something", + "es": "A 0 units, Do something", + "fr": "In 0 units, Do something", + "id": "In 0 units, Do something", + "it": "Tra 0 units Do something", + "nl": "In 0 units, Do something", + "pl": "In 0 units, Do something", + "pt-BR": "In 0 units, Do something", + "ru": "Через 0 units Do something", + "sv": "Om 0 units, Do something", + "uk": "In 0 units, Do something", + "vi": "0 units nữa thì Do something", + "zh-Hans": "In 0 units, Do something" + } +} diff --git a/test/fixtures/v5/phrase/two_linked.json b/test/fixtures/v5/phrase/two_linked.json new file mode 100644 index 000000000..35dcd69f6 --- /dev/null +++ b/test/fixtures/v5/phrase/two_linked.json @@ -0,0 +1,22 @@ +{ + "options": { + "instruction_one": "Do this", + "instruction_two": "Do that" + }, + "phrases": { + "de": "Do this then Do that", + "en": "Do this then Do that", + "es": "Do this, entonces Do that", + "fr": "Do this then Do that", + "id": "Do this then Do that", + "it": "Do this poi Do that", + "nl": "Do this then Do that", + "pl": "Do this then Do that", + "pt-BR": "Do this then Do that", + "ru": "Do this, затем Do that", + "sv": "Do this, sedan Do that", + "uk": "Do this then Do that", + "vi": "Do this, rồi Do that", + "zh-Hans": "Do this then Do that" + } +} diff --git a/test/fixtures/v5/phrase/two_linked_by_distance.json b/test/fixtures/v5/phrase/two_linked_by_distance.json new file mode 100644 index 000000000..b2cac4740 --- /dev/null +++ b/test/fixtures/v5/phrase/two_linked_by_distance.json @@ -0,0 +1,23 @@ +{ + "options": { + "instruction_one": "Do this", + "instruction_two": "Do that", + "distance": "0 units" + }, + "phrases": { + "de": "Do this then in 0 units Do that", + "en": "Do this then in 0 units Do that", + "es": "Do this, entonces a 0 units, Do that", + "fr": "Do this then in 0 units Do that", + "id": "Do this then in 0 units Do that", + "it": "Do this, poi tra 0 units Do that", + "nl": "Do this then in 0 units Do that", + "pl": "Do this then in 0 units Do that", + "pt-BR": "Do this then in 0 units Do that", + "ru": "Do this, затем через 0 units Do that", + "sv": "Do this, sedan om 0 units, Do that", + "uk": "Do this then in 0 units Do that", + "vi": "Do this, rồi 0 units nữa thì Do that", + "zh-Hans": "Do this then in 0 units Do that" + } +} diff --git a/test/fixtures/v5/rotary/exit_7.json b/test/fixtures/v5/rotary/exit_7.json index 77332bff1..e208fb8d7 100644 --- a/test/fixtures/v5/rotary/exit_7.json +++ b/test/fixtures/v5/rotary/exit_7.json @@ -11,7 +11,7 @@ "de": "Im Kreisverkehr die siebente Ausfahrt nehmen", "en": "Enter the rotary and take the 7th exit", "es": "Entra en la rotonda y toma la 7ª salida", - "fr": "Entrer dans le rond-point et prendre la setpième sortie", + "fr": "Entrer dans le rond-point et prendre la septième sortie", "id": "Masuk bundaran dan ambil jalan keluar 7", "it": "Immettiti nella rotonda e prendi la 7ª uscita", "nl": "Ga het knooppunt op en neem afslag 7e", diff --git a/test/fixtures_test.js b/test/fixtures_test.js index 1b5169946..fc239a047 100644 --- a/test/fixtures_test.js +++ b/test/fixtures_test.js @@ -6,11 +6,13 @@ var tape = require('tape'); var mkdirp = require('mkdirp'); var constants = require('./constants'); -var instructions = require('../index.js'); -var supportedCodes = require('../languages').supportedCodes; +var languages = require('../languages'); +var supportedCodes = languages.supportedCodes; // Load instructions files for each language -var languages = instructions('v5'); +var instructions = languages.instructions; +var version = 'v5'; +var compiler = require('../index.js')(version); tape.test('verify existance/update fixtures', function(assert) { function clone(obj) { @@ -25,7 +27,7 @@ tape.test('verify existance/update fixtures', function(assert) { var result = {}; supportedCodes.forEach((k) => { - result[k] = languages.compile(k, step, options); + result[k] = compiler.compile(k, step, options); }); return result; @@ -515,5 +517,67 @@ tape.test('verify existance/update fixtures', function(assert) { } }); + function phraseForLanguages(phrase, options) { + var result = {}; + + supportedCodes.forEach((k) => { + result[k] = compiler.tokenize(k, instructions[k][version].phrase[phrase], options); + }); + + return result; + } + + function checkOrWritePhrase(basePath, phrase, options) { + var fileName = path.join(basePath, `${underscorify(phrase)}.json`); + + if (process.env.UPDATE) { + var data = { + options: options, + phrases: phraseForLanguages(phrase, options) + }; + + fs.writeFileSync( + fileName, + JSON.stringify(data, null, 4) + '\n' + ); + assert.ok(true, `updated ${phrase}`); + } else { + // check for existance + assert.ok( + fs.existsSync(fileName), + `verified existance of ${phrase}` + ); + } + } + + function checkOrWritePhrases() { + var basePath = path.join(__dirname, 'fixtures', 'v5', 'phrase'); + var distance = '0 units'; + + // verify directory exists + mkdirp.sync(basePath); + + // two linked by distance + checkOrWritePhrase(basePath, 'two linked by distance', { + 'instruction_one': 'Do this', + 'instruction_two': 'Do that', + distance: distance + }); + + // two linked + checkOrWritePhrase(basePath, 'two linked', { + 'instruction_one': 'Do this', + 'instruction_two': 'Do that' + }); + + // one in distance + checkOrWritePhrase(basePath, 'one in distance', { + 'instruction_one': 'Do something', + distance: distance + }); + } + + checkOrWritePhrases(); + assert.end(); }); diff --git a/test/index_test.js b/test/index_test.js index 7e18f369a..e740650fd 100644 --- a/test/index_test.js +++ b/test/index_test.js @@ -2,32 +2,34 @@ var path = require('path'); var fs = require('fs'); var tape = require('tape'); -var instructions = require('../index'); +var compiler = require('../index'); +var languages = require('../languages'); +var instructions = languages.instructions; tape.test('v5 tokenize', function(assert) { - var v5Instructions = instructions('v5'); + var v5Compiler = compiler('v5'); var tokenString = 'Can {first} {second}'; - var hasBoth = v5Instructions.tokenize('en', tokenString, { + var hasBoth = v5Compiler.tokenize('en', tokenString, { first: 'osrm', second: 'do routing' }); assert.equal(hasBoth, 'Can osrm do routing', 'does find and replace'); - var hasFirst = v5Instructions.tokenize('en', tokenString, { + var hasFirst = v5Compiler.tokenize('en', tokenString, { first: 'osrm', second: '' }); assert.equal(hasFirst, 'Can osrm ', 'does find and replace and does not drop trailing spaces'); - var hasSecond = v5Instructions.tokenize('en', tokenString, { + var hasSecond = v5Compiler.tokenize('en', tokenString, { second: 'swim', first: '' }); assert.equal(hasSecond, 'Can swim', 'does find and replace and drops internal extra spaces'); - var missingSecond = v5Instructions.tokenize('en', tokenString, { + var missingSecond = v5Compiler.tokenize('en', tokenString, { first: 'osrm' }); assert.equal(missingSecond, 'Can osrm {second}', 'does not replace tokens which are not provided'); @@ -37,10 +39,10 @@ tape.test('v5 tokenize', function(assert) { }); tape.test('v5 directionFromDegree', function(assert) { - var v5Instructions = instructions('v5'); + var v5Compiler = compiler('v5'); assert.equal( - v5Instructions.directionFromDegree('en', undefined), // eslint-disable-line no-undefined + v5Compiler.directionFromDegree('en', undefined), // eslint-disable-line no-undefined '', 'empty string for undefined' ); @@ -67,14 +69,14 @@ tape.test('v5 directionFromDegree', function(assert) { [ 360, 'north' ] ].forEach((d) => { assert.equal( - v5Instructions.directionFromDegree('en', d[0]), + v5Compiler.directionFromDegree('en', d[0]), d[1], `${d[0]} degrees is ${d[1]}` ); }); assert.throws( - () => { v5Instructions.directionFromDegree('en', 361); }, + () => { v5Compiler.directionFromDegree('en', 361); }, 'throws on out of bounds degree' ); @@ -82,7 +84,7 @@ tape.test('v5 directionFromDegree', function(assert) { }); tape.test('v5 laneDiagram', function(assert) { - var v5Instructions = instructions('v5'); + var v5Compiler = compiler('v5'); function makeStep(config) { return { @@ -103,17 +105,17 @@ tape.test('v5 laneDiagram', function(assert) { [ [ false, true, false, true, false], 'xoxox' ], [ [ false, false, false], 'x' ] ].forEach((c) => { - assert.equal(v5Instructions.laneConfig(makeStep(c[0])), c[1], `correct Diagram ${c[1]}`); + assert.equal(v5Compiler.laneConfig(makeStep(c[0])), c[1], `correct Diagram ${c[1]}`); }); assert.throws( - () => { v5Instructions.laneConfig({}); }, + () => { v5Compiler.laneConfig({}); }, 'throws on non-existing intersections' ); assert.throws( () => { - v5Instructions.laneConfig({ + v5Compiler.laneConfig({ intersections: [ {} ] @@ -127,10 +129,10 @@ tape.test('v5 laneDiagram', function(assert) { tape.test('v5 compile', function(t) { t.test('throws an error if no language code provided', function(assert) { - var v5Instructions = instructions('v5'); + var v5Compiler = compiler('v5'); assert.throws(function() { - v5Instructions.compile(); + v5Compiler.compile(); }, /No language code provided/ ); @@ -138,10 +140,10 @@ tape.test('v5 compile', function(t) { }); t.test('throws an error if a non supported language code is provided', function(assert) { - var v5Instructions = instructions('v5'); + var v5Compiler = compiler('v5'); assert.throws(function() { - v5Instructions.compile('foo'); + v5Compiler.compile('foo'); }, /language code foo not loaded/ ); @@ -149,7 +151,7 @@ tape.test('v5 compile', function(t) { }); t.test('respects options.instructionStringHook', function(assert) { - var v5Instructions = instructions('v5', { + var v5Compiler = compiler('v5', { hooks: { tokenizedInstruction: function(instruction) { return instruction.replace('{way_name}', '{way_name}'); @@ -157,7 +159,7 @@ tape.test('v5 compile', function(t) { } }); - assert.equal(v5Instructions.compile('en', { + assert.equal(v5Compiler.compile('en', { maneuver: { type: 'turn', modifier: 'left' @@ -169,34 +171,61 @@ tape.test('v5 compile', function(t) { t.test('fixtures match generated instructions', function(assert) { // pre-load instructions - var instructionsPerLanguage = instructions('v5'); + var version = 'v5'; + var instructionsPerLanguage = compiler(version); - var basePath = path.join(__dirname, 'fixtures', 'v5'); + var basePath = path.join(__dirname, 'fixtures', version); fs.readdirSync(basePath).forEach(function(type) { if (type.match(/^\./)) return; // ignore temporary files - fs.readdirSync(path.join(basePath, type)).forEach(function(file) { - if (!file.match(/\.json$/)) return; - - var p = path.join(basePath, type, file); - var fixture = JSON.parse(fs.readFileSync(p)); - var options; - if (fixture.options) { - options = {}; - options.legIndex = fixture.options.legIndex; - options.legCount = fixture.options.legCount; - options.classes = fixture.options.classes; - } - - Object.keys(fixture.instructions).forEach((l) => { - assert.equal( - instructionsPerLanguage.compile(l, fixture.step, options), - fixture.instructions[l], - `${type}/${file}/${l}` - ); + if (type === 'phrase') { + fs.readdirSync(path.join(basePath, type)).forEach(function(file) { + if (!file.match(/\.json$/)) return; + + var p = path.join(basePath, type, file); + var fixture = JSON.parse(fs.readFileSync(p)); + var phrase = file.replace(/\..*/, '').replace(/_/g, ' '); + var options; + if (fixture.options) { + options = { + 'instruction_one': fixture.options.instruction_one, + 'instruction_two': fixture.options.instruction_two, + distance: fixture.options.distance + }; + } + + Object.keys(fixture.phrases).forEach((l) => { + assert.equal( + instructionsPerLanguage.tokenize(l, instructions[l][version].phrase[phrase], options), + fixture.phrases[l], + `${type}/${file}/${l}` + ); + }); }); - }); + } else { + fs.readdirSync(path.join(basePath, type)).forEach(function(file) { + if (!file.match(/\.json$/)) return; + + var p = path.join(basePath, type, file); + var fixture = JSON.parse(fs.readFileSync(p)); + var options; + if (fixture.options) { + options = {}; + options.legIndex = fixture.options.legIndex; + options.legCount = fixture.options.legCount; + options.classes = fixture.options.classes; + } + + Object.keys(fixture.instructions).forEach((l) => { + assert.equal( + instructionsPerLanguage.compile(l, fixture.step, options), + fixture.instructions[l], + `${type}/${file}/${l}` + ); + }); + }); + } }); assert.end();