From d6cdae54ff8a3a6c259fa39baf6d2964f0a310d2 Mon Sep 17 00:00:00 2001 From: Lyzi Diamond Date: Tue, 24 Oct 2017 15:04:25 -0700 Subject: [PATCH 1/4] add condition for merge straight --- languages/translations/de.json | 5 +++ languages/translations/en.json | 5 +++ languages/translations/eo.json | 5 +++ languages/translations/es-ES.json | 5 +++ languages/translations/es.json | 5 +++ languages/translations/fr.json | 5 +++ languages/translations/id.json | 5 +++ languages/translations/it.json | 5 +++ languages/translations/nl.json | 5 +++ languages/translations/pl.json | 5 +++ languages/translations/pt-BR.json | 5 +++ languages/translations/ro.json | 5 +++ languages/translations/ru.json | 5 +++ languages/translations/sv.json | 5 +++ languages/translations/tr.json | 5 +++ languages/translations/uk.json | 5 +++ languages/translations/vi.json | 5 +++ languages/translations/zh-Hans.json | 5 +++ test/fixtures/v5/merge/straight_default.json | 36 +++++++++---------- .../v5/merge/straight_destination.json | 36 +++++++++---------- test/fixtures/v5/merge/straight_exit.json | 36 +++++++++---------- .../v5/merge/straight_exit_destination.json | 36 +++++++++---------- test/fixtures/v5/merge/straight_name.json | 36 +++++++++---------- test/languages_test.js | 2 ++ 24 files changed, 182 insertions(+), 90 deletions(-) diff --git a/languages/translations/de.json b/languages/translations/de.json index 2c75eb937..25e4a13f5 100644 --- a/languages/translations/de.json +++ b/languages/translations/de.json @@ -192,6 +192,11 @@ "name": "{modifier} auffahren auf {way_name}", "destination": "{modifier} auffahren Richtung {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Leicht links auffahren", "name": "Leicht links auffahren auf {way_name}", diff --git a/languages/translations/en.json b/languages/translations/en.json index 072e1c9f8..8e586cc75 100644 --- a/languages/translations/en.json +++ b/languages/translations/en.json @@ -192,6 +192,11 @@ "name": "Merge {modifier} onto {way_name}", "destination": "Merge {modifier} towards {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Merge left", "name": "Merge left onto {way_name}", diff --git a/languages/translations/eo.json b/languages/translations/eo.json index fa0926873..d2e103cd3 100644 --- a/languages/translations/eo.json +++ b/languages/translations/eo.json @@ -192,6 +192,11 @@ "name": "Enveturu {modifier} al {way_name}", "destination": "Enveturu {modifier} direkte al {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Enveturu de maldekstre", "name": "Enveturu de maldekstre al {way_name}", diff --git a/languages/translations/es-ES.json b/languages/translations/es-ES.json index 235607085..65496b746 100644 --- a/languages/translations/es-ES.json +++ b/languages/translations/es-ES.json @@ -192,6 +192,11 @@ "name": "Incorpórate {modifier} por {way_name}", "destination": "Incorpórate {modifier} hacia {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Incorpórate a la izquierda", "name": "Incorpórate a la izquierda por {way_name}", diff --git a/languages/translations/es.json b/languages/translations/es.json index 8277e2793..94314d758 100644 --- a/languages/translations/es.json +++ b/languages/translations/es.json @@ -192,6 +192,11 @@ "name": "Gire a {modifier} en {way_name}", "destination": "Gire a {modifier} hacia {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Gire a la izquierda", "name": "Gire a la izquierda en {way_name}", diff --git a/languages/translations/fr.json b/languages/translations/fr.json index f986d0f9d..3093d0433 100644 --- a/languages/translations/fr.json +++ b/languages/translations/fr.json @@ -192,6 +192,11 @@ "name": "Rejoindre {modifier} sur {way_name}", "destination": "Rejoindre {modifier} en direction de {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Rejoindre par la gauche", "name": "Rejoindre {way_name} par la gauche", diff --git a/languages/translations/id.json b/languages/translations/id.json index 702cd442f..d38e6cd17 100644 --- a/languages/translations/id.json +++ b/languages/translations/id.json @@ -192,6 +192,11 @@ "name": "Bergabung {modifier} ke arah {way_name}", "destination": "Bergabung {modifier} menuju {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Bergabung di kiri", "name": "Bergabung di kiri ke arah {way_name}", diff --git a/languages/translations/it.json b/languages/translations/it.json index f1315176d..040d95bbd 100644 --- a/languages/translations/it.json +++ b/languages/translations/it.json @@ -192,6 +192,11 @@ "name": "Immettiti {modifier} in {way_name}", "destination": "Immettiti {modifier} verso {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Immettiti a sinistra", "name": "Immettiti a sinistra in {way_name}", diff --git a/languages/translations/nl.json b/languages/translations/nl.json index 67bdf01bb..a5eeb899f 100644 --- a/languages/translations/nl.json +++ b/languages/translations/nl.json @@ -192,6 +192,11 @@ "name": "Bij de splitsing {modifier} naar {way_name}", "destination": "Bij de splitsing {modifier} richting {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Bij de splitsing links aanhouden", "name": "Bij de splitsing links aanhouden naar {way_name}", diff --git a/languages/translations/pl.json b/languages/translations/pl.json index e7c5d8ac0..138a4135f 100644 --- a/languages/translations/pl.json +++ b/languages/translations/pl.json @@ -192,6 +192,11 @@ "name": "Włącz się {modifier} na {way_name}", "destination": "Włącz się {modifier} w kierunku {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Włącz się z lewej strony", "name": "Włącz się z lewej strony na {way_name}", diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json index 121349866..93272f42e 100644 --- a/languages/translations/pt-BR.json +++ b/languages/translations/pt-BR.json @@ -192,6 +192,11 @@ "name": "Entre {modifier} na {way_name}", "destination": "Entre {modifier} em direção à {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Entre à esquerda", "name": "Entre à esquerda na {way_name}", diff --git a/languages/translations/ro.json b/languages/translations/ro.json index bae1c7a43..96f2db28f 100755 --- a/languages/translations/ro.json +++ b/languages/translations/ro.json @@ -192,6 +192,11 @@ "name": "Intrați în {modifier} pe {way_name}", "destination": "Intrați în {modifier} spre {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Intrați în stânga", "name": "Intrați în stânga pe {way_name}", diff --git a/languages/translations/ru.json b/languages/translations/ru.json index e945da652..96b8e9c8c 100644 --- a/languages/translations/ru.json +++ b/languages/translations/ru.json @@ -192,6 +192,11 @@ "name": "Перестройтесь {modifier} на {way_name:accusative}", "destination": "Перестройтесь {modifier} в направлении {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Перестройтесь левее", "name": "Перестройтесь левее на {way_name:accusative}", diff --git a/languages/translations/sv.json b/languages/translations/sv.json index 98253e67e..5ce18b0f5 100644 --- a/languages/translations/sv.json +++ b/languages/translations/sv.json @@ -192,6 +192,11 @@ "name": "Byt till {modifier} körfält in på {way_name}", "destination": "Byt till {modifier} körfält mot {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Byt till vänstra körfältet", "name": "Byt till vänstra körfältet in på {way_name}", diff --git a/languages/translations/tr.json b/languages/translations/tr.json index 18d15b207..5097ad8f9 100644 --- a/languages/translations/tr.json +++ b/languages/translations/tr.json @@ -192,6 +192,11 @@ "name": "{way_name} üzerinde {modifier} yöne gir", "destination": "{destination} istikametinde {modifier} yöne gir" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Sola gir", "name": "{way_name} üzerinde sola gir", diff --git a/languages/translations/uk.json b/languages/translations/uk.json index 48655be7c..b840caa5e 100644 --- a/languages/translations/uk.json +++ b/languages/translations/uk.json @@ -192,6 +192,11 @@ "name": "Приєднайтеся до потоку {modifier} на {way_name}", "destination": "Приєднайтеся до потоку {modifier} у напрямку {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Приєднайтеся до потоку ліворуч", "name": "Приєднайтеся до потоку ліворуч на {way_name}", diff --git a/languages/translations/vi.json b/languages/translations/vi.json index 0c988d0e0..de674af93 100644 --- a/languages/translations/vi.json +++ b/languages/translations/vi.json @@ -192,6 +192,11 @@ "name": "Nhập sang {modifier} vào {way_name}", "destination": "Nhập sang {modifier} đến {destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "slight left": { "default": "Nhập sang trái", "name": "Nhập sang trái vào {way_name}", diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json index dac022ebd..ade8e434c 100644 --- a/languages/translations/zh-Hans.json +++ b/languages/translations/zh-Hans.json @@ -155,6 +155,11 @@ "name": "{modifier}并道，上{way_name}", "destination": "{modifier}并道，前往{destination}" }, + "straight": { + "default": "Merge", + "name": "Merge onto {way_name}", + "destination": "Merge towards {destination}" + }, "uturn": { "default": "调头", "name": "调头，上{way_name}", diff --git a/test/fixtures/v5/merge/straight_default.json b/test/fixtures/v5/merge/straight_default.json index adf354c8c..ea6053db1 100644 --- a/test/fixtures/v5/merge/straight_default.json +++ b/test/fixtures/v5/merge/straight_default.json @@ -7,23 +7,23 @@ "name": "" }, "instructions": { - "de": "Geradeaus auffahren", - "en": "Merge straight", - "eo": "Enveturu rekten", - "es": "Gire a recto", - "es-ES": "Incorpórate recto", - "fr": "Rejoindre tout droit", - "id": "Bergabung lurus", - "it": "Immettiti a dritto", - "nl": "Bij de splitsing rechtdoor", - "pl": "Włącz się prosto", - "pt-BR": "Entre reto", - "ro": "Intrați în înainte", - "ru": "Перестройтесь прямо", - "sv": "Byt till rakt fram körfält", - "tr": "Düz yöne gir", - "uk": "Приєднайтеся до потоку прямо", - "vi": "Nhập sang thẳng", - "zh-Hans": "直行并道" + "de": "Merge", + "en": "Merge", + "eo": "Merge", + "es": "Merge", + "es-ES": "Merge", + "fr": "Merge", + "id": "Merge", + "it": "Merge", + "nl": "Merge", + "pl": "Merge", + "pt-BR": "Merge", + "ro": "Merge", + "ru": "Merge", + "sv": "Merge", + "tr": "Merge", + "uk": "Merge", + "vi": "Merge", + "zh-Hans": "Merge" } } diff --git a/test/fixtures/v5/merge/straight_destination.json b/test/fixtures/v5/merge/straight_destination.json index 0dd5579f0..61a431e0d 100644 --- a/test/fixtures/v5/merge/straight_destination.json +++ b/test/fixtures/v5/merge/straight_destination.json @@ -8,23 +8,23 @@ "destinations": "Destination 1,Destination 2" }, "instructions": { - "de": "Geradeaus auffahren Richtung Destination 1", - "en": "Merge straight towards Destination 1", - "eo": "Enveturu rekten direkte al Destination 1", - "es": "Gire a recto hacia Destination 1", - "es-ES": "Incorpórate recto hacia Destination 1", - "fr": "Rejoindre tout droit en direction de Destination 1", - "id": "Bergabung lurus menuju Destination 1", - "it": "Immettiti dritto verso Destination 1", - "nl": "Bij de splitsing rechtdoor richting Destination 1", - "pl": "Włącz się prosto w kierunku Destination 1", - "pt-BR": "Entre reto em direção à Destination 1", - "ro": "Intrați în înainte spre Destination 1", - "ru": "Перестройтесь прямо в направлении Destination 1", - "sv": "Byt till rakt fram körfält mot Destination 1", - "tr": "Destination 1 istikametinde düz yöne gir", - "uk": "Приєднайтеся до потоку прямо у напрямку Destination 1", - "vi": "Nhập sang thẳng đến Destination 1", - "zh-Hans": "直行并道，前往Destination 1" + "de": "Merge towards Destination 1", + "en": "Merge towards Destination 1", + "eo": "Merge towards Destination 1", + "es": "Merge towards Destination 1", + "es-ES": "Merge towards Destination 1", + "fr": "Merge towards Destination 1", + "id": "Merge towards Destination 1", + "it": "Merge towards Destination 1", + "nl": "Merge towards Destination 1", + "pl": "Merge towards Destination 1", + "pt-BR": "Merge towards Destination 1", + "ro": "Merge towards Destination 1", + "ru": "Merge towards Destination 1", + "sv": "Merge towards Destination 1", + "tr": "Merge towards Destination 1", + "uk": "Merge towards Destination 1", + "vi": "Merge towards Destination 1", + "zh-Hans": "Merge towards Destination 1" } } diff --git a/test/fixtures/v5/merge/straight_exit.json b/test/fixtures/v5/merge/straight_exit.json index 7deeba0e0..c0437a8ed 100644 --- a/test/fixtures/v5/merge/straight_exit.json +++ b/test/fixtures/v5/merge/straight_exit.json @@ -8,23 +8,23 @@ "exits": "4A;4B" }, "instructions": { - "de": "Geradeaus auffahren auf Way Name", - "en": "Merge straight onto Way Name", - "eo": "Enveturu rekten al Way Name", - "es": "Gire a recto en Way Name", - "es-ES": "Incorpórate recto por Way Name", - "fr": "Rejoindre tout droit sur Way Name", - "id": "Bergabung lurus ke arah Way Name", - "it": "Immettiti dritto in Way Name", - "nl": "Bij de splitsing rechtdoor naar Way Name", - "pl": "Włącz się prosto na Way Name", - "pt-BR": "Entre reto na Way Name", - "ro": "Intrați în înainte pe Way Name", - "ru": "Перестройтесь прямо на Way Name", - "sv": "Byt till rakt fram körfält in på Way Name", - "tr": "Way Name üzerinde düz yöne gir", - "uk": "Приєднайтеся до потоку прямо на Way Name", - "vi": "Nhập sang thẳng vào Way Name", - "zh-Hans": "直行并道，上Way Name" + "de": "Merge onto Way Name", + "en": "Merge onto Way Name", + "eo": "Merge onto Way Name", + "es": "Merge onto Way Name", + "es-ES": "Merge onto Way Name", + "fr": "Merge onto Way Name", + "id": "Merge onto Way Name", + "it": "Merge onto Way Name", + "nl": "Merge onto Way Name", + "pl": "Merge onto Way Name", + "pt-BR": "Merge onto Way Name", + "ro": "Merge onto Way Name", + "ru": "Merge onto Way Name", + "sv": "Merge onto Way Name", + "tr": "Merge onto Way Name", + "uk": "Merge onto Way Name", + "vi": "Merge onto Way Name", + "zh-Hans": "Merge onto Way Name" } } diff --git a/test/fixtures/v5/merge/straight_exit_destination.json b/test/fixtures/v5/merge/straight_exit_destination.json index 7374b76ba..1ea0a1f0e 100644 --- a/test/fixtures/v5/merge/straight_exit_destination.json +++ b/test/fixtures/v5/merge/straight_exit_destination.json @@ -9,23 +9,23 @@ "exits": "4A;4B" }, "instructions": { - "de": "Geradeaus auffahren Richtung Destination 1", - "en": "Merge straight towards Destination 1", - "eo": "Enveturu rekten direkte al Destination 1", - "es": "Gire a recto hacia Destination 1", - "es-ES": "Incorpórate recto hacia Destination 1", - "fr": "Rejoindre tout droit en direction de Destination 1", - "id": "Bergabung lurus menuju Destination 1", - "it": "Immettiti dritto verso Destination 1", - "nl": "Bij de splitsing rechtdoor richting Destination 1", - "pl": "Włącz się prosto w kierunku Destination 1", - "pt-BR": "Entre reto em direção à Destination 1", - "ro": "Intrați în înainte spre Destination 1", - "ru": "Перестройтесь прямо в направлении Destination 1", - "sv": "Byt till rakt fram körfält mot Destination 1", - "tr": "Destination 1 istikametinde düz yöne gir", - "uk": "Приєднайтеся до потоку прямо у напрямку Destination 1", - "vi": "Nhập sang thẳng đến Destination 1", - "zh-Hans": "直行并道，前往Destination 1" + "de": "Merge towards Destination 1", + "en": "Merge towards Destination 1", + "eo": "Merge towards Destination 1", + "es": "Merge towards Destination 1", + "es-ES": "Merge towards Destination 1", + "fr": "Merge towards Destination 1", + "id": "Merge towards Destination 1", + "it": "Merge towards Destination 1", + "nl": "Merge towards Destination 1", + "pl": "Merge towards Destination 1", + "pt-BR": "Merge towards Destination 1", + "ro": "Merge towards Destination 1", + "ru": "Merge towards Destination 1", + "sv": "Merge towards Destination 1", + "tr": "Merge towards Destination 1", + "uk": "Merge towards Destination 1", + "vi": "Merge towards Destination 1", + "zh-Hans": "Merge towards Destination 1" } } diff --git a/test/fixtures/v5/merge/straight_name.json b/test/fixtures/v5/merge/straight_name.json index 6368f1cf0..849b1ff14 100644 --- a/test/fixtures/v5/merge/straight_name.json +++ b/test/fixtures/v5/merge/straight_name.json @@ -7,23 +7,23 @@ "name": "Way Name" }, "instructions": { - "de": "Geradeaus auffahren auf Way Name", - "en": "Merge straight onto Way Name", - "eo": "Enveturu rekten al Way Name", - "es": "Gire a recto en Way Name", - "es-ES": "Incorpórate recto por Way Name", - "fr": "Rejoindre tout droit sur Way Name", - "id": "Bergabung lurus ke arah Way Name", - "it": "Immettiti dritto in Way Name", - "nl": "Bij de splitsing rechtdoor naar Way Name", - "pl": "Włącz się prosto na Way Name", - "pt-BR": "Entre reto na Way Name", - "ro": "Intrați în înainte pe Way Name", - "ru": "Перестройтесь прямо на Way Name", - "sv": "Byt till rakt fram körfält in på Way Name", - "tr": "Way Name üzerinde düz yöne gir", - "uk": "Приєднайтеся до потоку прямо на Way Name", - "vi": "Nhập sang thẳng vào Way Name", - "zh-Hans": "直行并道，上Way Name" + "de": "Merge onto Way Name", + "en": "Merge onto Way Name", + "eo": "Merge onto Way Name", + "es": "Merge onto Way Name", + "es-ES": "Merge onto Way Name", + "fr": "Merge onto Way Name", + "id": "Merge onto Way Name", + "it": "Merge onto Way Name", + "nl": "Merge onto Way Name", + "pl": "Merge onto Way Name", + "pt-BR": "Merge onto Way Name", + "ro": "Merge onto Way Name", + "ru": "Merge onto Way Name", + "sv": "Merge onto Way Name", + "tr": "Merge onto Way Name", + "uk": "Merge onto Way Name", + "vi": "Merge onto Way Name", + "zh-Hans": "Merge onto Way Name" } } diff --git a/test/languages_test.js b/test/languages_test.js index 71064599f..b28892343 100644 --- a/test/languages_test.js +++ b/test/languages_test.js @@ -62,6 +62,8 @@ tape.test('verify language files structure', function(assert) { ); } + assert.ok(translation.v5.merge.straight, l + ' has merge straight key'); + }); assert.end(); From a24d07288ccc8ce78d1c48d78f4074635184442b Mon Sep 17 00:00:00 2001 From: Lyzi Diamond Date: Tue, 24 Oct 2017 15:59:45 -0700 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7f339f5..b85b270cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. For change log formatting, see http://keepachangelog.com/ +## master + +- Added a `merge straight` instruction [#183](https://github.com/Project-OSRM/osrm-text-instructions/pull/183) + ## 0.10.4 2017-10-26 - Add a phrase for an upcoming arrival step [#184](https://github.com/Project-OSRM/osrm-text-instructions/pull/184) From 046542ceebeeeeb0d4466c54a49a90372f998dd5 Mon Sep 17 00:00:00 2001 From: allierowan Date: Thu, 26 Oct 2017 11:40:12 -0700 Subject: [PATCH 3/4] merge [straight word] in language --- languages/translations/de.json | 8 ++++---- languages/translations/eo.json | 6 +++--- languages/translations/es-ES.json | 6 +++--- languages/translations/es.json | 6 +++--- languages/translations/fr.json | 8 ++++---- languages/translations/id.json | 8 ++++---- languages/translations/it.json | 6 +++--- languages/translations/nl.json | 8 ++++---- languages/translations/pl.json | 6 +++--- languages/translations/pt-BR.json | 8 ++++---- languages/translations/ro.json | 6 +++--- languages/translations/ru.json | 8 ++++---- languages/translations/sv.json | 6 +++--- languages/translations/tr.json | 6 +++--- languages/translations/uk.json | 8 ++++---- languages/translations/vi.json | 6 +++--- languages/translations/zh-Hans.json | 8 ++++---- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/languages/translations/de.json b/languages/translations/de.json index 25e4a13f5..27a1e6de4 100644 --- a/languages/translations/de.json +++ b/languages/translations/de.json @@ -193,9 +193,9 @@ "destination": "{modifier} auffahren Richtung {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "geradeaus auffahren", + "name": "geradeaus auffahren auf {way_name}", + "destination": "geradeaus auffahren Richtung {destination}" }, "slight left": { "default": "Leicht links auffahren", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/eo.json b/languages/translations/eo.json index d2e103cd3..c7af8b3c2 100644 --- a/languages/translations/eo.json +++ b/languages/translations/eo.json @@ -193,9 +193,9 @@ "destination": "Enveturu {modifier} direkte al {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Enveturu rekten", + "name": "Enveturu rekten al {way_name}", + "destination": "Enveturu rekten direkte al {destination}" }, "slight left": { "default": "Enveturu de maldekstre", diff --git a/languages/translations/es-ES.json b/languages/translations/es-ES.json index 65496b746..ad710eb45 100644 --- a/languages/translations/es-ES.json +++ b/languages/translations/es-ES.json @@ -193,9 +193,9 @@ "destination": "Incorpórate {modifier} hacia {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Incorpórate recto", + "name": "Incorpórate recto por {way_name}", + "destination": "Incorpórate recto hacia {destination}" }, "slight left": { "default": "Incorpórate a la izquierda", diff --git a/languages/translations/es.json b/languages/translations/es.json index 94314d758..2fa04b0e7 100644 --- a/languages/translations/es.json +++ b/languages/translations/es.json @@ -193,9 +193,9 @@ "destination": "Gire a {modifier} hacia {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Gire a recto", + "name": "Gire a recto en {way_name}", + "destination": "Gire a recto hacia {destination}" }, "slight left": { "default": "Gire a la izquierda", diff --git a/languages/translations/fr.json b/languages/translations/fr.json index 3093d0433..57e247abd 100644 --- a/languages/translations/fr.json +++ b/languages/translations/fr.json @@ -193,9 +193,9 @@ "destination": "Rejoindre {modifier} en direction de {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Rejoindre tout droit", + "name": "Rejoindre tout droit sur {way_name}", + "destination": "Rejoindre tout droit en direction de {destination}" }, "slight left": { "default": "Rejoindre par la gauche", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/id.json b/languages/translations/id.json index d38e6cd17..d1bf34377 100644 --- a/languages/translations/id.json +++ b/languages/translations/id.json @@ -193,9 +193,9 @@ "destination": "Bergabung {modifier} menuju {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Bergabung lurus", + "name": "Bergabung lurus ke arah {way_name}", + "destination": "Bergabung lurus menuju {destination}" }, "slight left": { "default": "Bergabung di kiri", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/it.json b/languages/translations/it.json index 040d95bbd..3f39ace57 100644 --- a/languages/translations/it.json +++ b/languages/translations/it.json @@ -193,9 +193,9 @@ "destination": "Immettiti {modifier} verso {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Immettiti a dritto", + "name": "Immettiti dritto in {way_name}", + "destination": "Immettiti dritto verso {destination}" }, "slight left": { "default": "Immettiti a sinistra", diff --git a/languages/translations/nl.json b/languages/translations/nl.json index a5eeb899f..faffa3a63 100644 --- a/languages/translations/nl.json +++ b/languages/translations/nl.json @@ -193,9 +193,9 @@ "destination": "Bij de splitsing {modifier} richting {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Bij de splitsing rechtdoor", + "name": "Bij de splitsing rechtdoor naar {way_name}", + "destination": "Bij de splitsing rechtdoor richting {destination}" }, "slight left": { "default": "Bij de splitsing links aanhouden", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/pl.json b/languages/translations/pl.json index 138a4135f..22f890622 100644 --- a/languages/translations/pl.json +++ b/languages/translations/pl.json @@ -193,9 +193,9 @@ "destination": "Włącz się {modifier} w kierunku {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Włącz się prosto", + "name": "Włącz się prosto na {way_name}", + "destination": "Włącz się prosto w kierunku {destination}" }, "slight left": { "default": "Włącz się z lewej strony", diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json index 93272f42e..d63c94b8f 100644 --- a/languages/translations/pt-BR.json +++ b/languages/translations/pt-BR.json @@ -193,9 +193,9 @@ "destination": "Entre {modifier} em direção à {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Entre reto", + "name": "Entre reto na {way_name}", + "destination": "Entre reto em direção à {destination}" }, "slight left": { "default": "Entre à esquerda", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/ro.json b/languages/translations/ro.json index 96f2db28f..4c3b56851 100755 --- a/languages/translations/ro.json +++ b/languages/translations/ro.json @@ -193,9 +193,9 @@ "destination": "Intrați în {modifier} spre {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Intrați în înainte", + "name": "Intrați în înainte pe {way_name}", + "destination": "Intrați în înainte spre {destination}" }, "slight left": { "default": "Intrați în stânga", diff --git a/languages/translations/ru.json b/languages/translations/ru.json index 96b8e9c8c..ec0496756 100644 --- a/languages/translations/ru.json +++ b/languages/translations/ru.json @@ -193,9 +193,9 @@ "destination": "Перестройтесь {modifier} в направлении {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Перестройтесь прямо", + "name": "Перестройтесь прямо на {way_name:accusative}", + "destination": "Перестройтесь прямо в направлении {destination}" }, "slight left": { "default": "Перестройтесь левее", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/sv.json b/languages/translations/sv.json index 5ce18b0f5..5fa200da0 100644 --- a/languages/translations/sv.json +++ b/languages/translations/sv.json @@ -193,9 +193,9 @@ "destination": "Byt till {modifier} körfält mot {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Byt till rakt fram körfält", + "name": "Byt till rakt fram körfält in på {way_name}", + "destination": "Byt till rakt fram körfält mot {destination}" }, "slight left": { "default": "Byt till vänstra körfältet", diff --git a/languages/translations/tr.json b/languages/translations/tr.json index 5097ad8f9..32a750ab4 100644 --- a/languages/translations/tr.json +++ b/languages/translations/tr.json @@ -193,9 +193,9 @@ "destination": "{destination} istikametinde {modifier} yöne gir" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "düz yöne gir", + "name": "{way_name} üzerinde düz yöne gir", + "destination": "{destination} istikametinde düz yöne gir" }, "slight left": { "default": "Sola gir", diff --git a/languages/translations/uk.json b/languages/translations/uk.json index b840caa5e..ecc66f259 100644 --- a/languages/translations/uk.json +++ b/languages/translations/uk.json @@ -193,9 +193,9 @@ "destination": "Приєднайтеся до потоку {modifier} у напрямку {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Приєднайтеся до потоку прямо", + "name": "Приєднайтеся до потоку прямо на {way_name}", + "destination": "Приєднайтеся до потоку прямо у напрямку {destination}" }, "slight left": { "default": "Приєднайтеся до потоку ліворуч", @@ -495,4 +495,4 @@ } } } -} +} \ No newline at end of file diff --git a/languages/translations/vi.json b/languages/translations/vi.json index de674af93..a50984169 100644 --- a/languages/translations/vi.json +++ b/languages/translations/vi.json @@ -193,9 +193,9 @@ "destination": "Nhập sang {modifier} đến {destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "Nhập sang thẳng", + "name": "Nhập sang thẳng vào {way_name}", + "destination": "Nhập sang thẳng đến {destination}" }, "slight left": { "default": "Nhập sang trái", diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json index ade8e434c..c6cdf64d1 100644 --- a/languages/translations/zh-Hans.json +++ b/languages/translations/zh-Hans.json @@ -156,9 +156,9 @@ "destination": "{modifier}并道，前往{destination}" }, "straight": { - "default": "Merge", - "name": "Merge onto {way_name}", - "destination": "Merge towards {destination}" + "default": "直行并道", + "name": "直行并道，上{way_name}", + "destination": "直行并道，前往{destination}" }, "uturn": { "default": "调头", @@ -370,4 +370,4 @@ } } } -} +} \ No newline at end of file From f9d014c6f2171f21f47dd544d2f1f7ad038950b9 Mon Sep 17 00:00:00 2001 From: allierowan Date: Thu, 26 Oct 2017 11:43:05 -0700 Subject: [PATCH 4/4] update fixtures back --- test/fixtures/v5/merge/straight_default.json | 34 +++++++++---------- .../v5/merge/straight_destination.json | 34 +++++++++---------- test/fixtures/v5/merge/straight_exit.json | 34 +++++++++---------- .../v5/merge/straight_exit_destination.json | 34 +++++++++---------- test/fixtures/v5/merge/straight_name.json | 34 +++++++++---------- 5 files changed, 85 insertions(+), 85 deletions(-) diff --git a/test/fixtures/v5/merge/straight_default.json b/test/fixtures/v5/merge/straight_default.json index ea6053db1..4c58daadc 100644 --- a/test/fixtures/v5/merge/straight_default.json +++ b/test/fixtures/v5/merge/straight_default.json @@ -7,23 +7,23 @@ "name": "" }, "instructions": { - "de": "Merge", + "de": "Geradeaus auffahren", "en": "Merge", - "eo": "Merge", - "es": "Merge", - "es-ES": "Merge", - "fr": "Merge", - "id": "Merge", - "it": "Merge", - "nl": "Merge", - "pl": "Merge", - "pt-BR": "Merge", - "ro": "Merge", - "ru": "Merge", - "sv": "Merge", - "tr": "Merge", - "uk": "Merge", - "vi": "Merge", - "zh-Hans": "Merge" + "eo": "Enveturu rekten", + "es": "Gire a recto", + "es-ES": "Incorpórate recto", + "fr": "Rejoindre tout droit", + "id": "Bergabung lurus", + "it": "Immettiti a dritto", + "nl": "Bij de splitsing rechtdoor", + "pl": "Włącz się prosto", + "pt-BR": "Entre reto", + "ro": "Intrați în înainte", + "ru": "Перестройтесь прямо", + "sv": "Byt till rakt fram körfält", + "tr": "Düz yöne gir", + "uk": "Приєднайтеся до потоку прямо", + "vi": "Nhập sang thẳng", + "zh-Hans": "直行并道" } } diff --git a/test/fixtures/v5/merge/straight_destination.json b/test/fixtures/v5/merge/straight_destination.json index 61a431e0d..65b778a51 100644 --- a/test/fixtures/v5/merge/straight_destination.json +++ b/test/fixtures/v5/merge/straight_destination.json @@ -8,23 +8,23 @@ "destinations": "Destination 1,Destination 2" }, "instructions": { - "de": "Merge towards Destination 1", + "de": "Geradeaus auffahren Richtung Destination 1", "en": "Merge towards Destination 1", - "eo": "Merge towards Destination 1", - "es": "Merge towards Destination 1", - "es-ES": "Merge towards Destination 1", - "fr": "Merge towards Destination 1", - "id": "Merge towards Destination 1", - "it": "Merge towards Destination 1", - "nl": "Merge towards Destination 1", - "pl": "Merge towards Destination 1", - "pt-BR": "Merge towards Destination 1", - "ro": "Merge towards Destination 1", - "ru": "Merge towards Destination 1", - "sv": "Merge towards Destination 1", - "tr": "Merge towards Destination 1", - "uk": "Merge towards Destination 1", - "vi": "Merge towards Destination 1", - "zh-Hans": "Merge towards Destination 1" + "eo": "Enveturu rekten direkte al Destination 1", + "es": "Gire a recto hacia Destination 1", + "es-ES": "Incorpórate recto hacia Destination 1", + "fr": "Rejoindre tout droit en direction de Destination 1", + "id": "Bergabung lurus menuju Destination 1", + "it": "Immettiti dritto verso Destination 1", + "nl": "Bij de splitsing rechtdoor richting Destination 1", + "pl": "Włącz się prosto w kierunku Destination 1", + "pt-BR": "Entre reto em direção à Destination 1", + "ro": "Intrați în înainte spre Destination 1", + "ru": "Перестройтесь прямо в направлении Destination 1", + "sv": "Byt till rakt fram körfält mot Destination 1", + "tr": "Destination 1 istikametinde düz yöne gir", + "uk": "Приєднайтеся до потоку прямо у напрямку Destination 1", + "vi": "Nhập sang thẳng đến Destination 1", + "zh-Hans": "直行并道，前往Destination 1" } } diff --git a/test/fixtures/v5/merge/straight_exit.json b/test/fixtures/v5/merge/straight_exit.json index c0437a8ed..7b0c1d471 100644 --- a/test/fixtures/v5/merge/straight_exit.json +++ b/test/fixtures/v5/merge/straight_exit.json @@ -8,23 +8,23 @@ "exits": "4A;4B" }, "instructions": { - "de": "Merge onto Way Name", + "de": "Geradeaus auffahren auf Way Name", "en": "Merge onto Way Name", - "eo": "Merge onto Way Name", - "es": "Merge onto Way Name", - "es-ES": "Merge onto Way Name", - "fr": "Merge onto Way Name", - "id": "Merge onto Way Name", - "it": "Merge onto Way Name", - "nl": "Merge onto Way Name", - "pl": "Merge onto Way Name", - "pt-BR": "Merge onto Way Name", - "ro": "Merge onto Way Name", - "ru": "Merge onto Way Name", - "sv": "Merge onto Way Name", - "tr": "Merge onto Way Name", - "uk": "Merge onto Way Name", - "vi": "Merge onto Way Name", - "zh-Hans": "Merge onto Way Name" + "eo": "Enveturu rekten al Way Name", + "es": "Gire a recto en Way Name", + "es-ES": "Incorpórate recto por Way Name", + "fr": "Rejoindre tout droit sur Way Name", + "id": "Bergabung lurus ke arah Way Name", + "it": "Immettiti dritto in Way Name", + "nl": "Bij de splitsing rechtdoor naar Way Name", + "pl": "Włącz się prosto na Way Name", + "pt-BR": "Entre reto na Way Name", + "ro": "Intrați în înainte pe Way Name", + "ru": "Перестройтесь прямо на Way Name", + "sv": "Byt till rakt fram körfält in på Way Name", + "tr": "Way Name üzerinde düz yöne gir", + "uk": "Приєднайтеся до потоку прямо на Way Name", + "vi": "Nhập sang thẳng vào Way Name", + "zh-Hans": "直行并道，上Way Name" } } diff --git a/test/fixtures/v5/merge/straight_exit_destination.json b/test/fixtures/v5/merge/straight_exit_destination.json index 1ea0a1f0e..deeb963d3 100644 --- a/test/fixtures/v5/merge/straight_exit_destination.json +++ b/test/fixtures/v5/merge/straight_exit_destination.json @@ -9,23 +9,23 @@ "exits": "4A;4B" }, "instructions": { - "de": "Merge towards Destination 1", + "de": "Geradeaus auffahren Richtung Destination 1", "en": "Merge towards Destination 1", - "eo": "Merge towards Destination 1", - "es": "Merge towards Destination 1", - "es-ES": "Merge towards Destination 1", - "fr": "Merge towards Destination 1", - "id": "Merge towards Destination 1", - "it": "Merge towards Destination 1", - "nl": "Merge towards Destination 1", - "pl": "Merge towards Destination 1", - "pt-BR": "Merge towards Destination 1", - "ro": "Merge towards Destination 1", - "ru": "Merge towards Destination 1", - "sv": "Merge towards Destination 1", - "tr": "Merge towards Destination 1", - "uk": "Merge towards Destination 1", - "vi": "Merge towards Destination 1", - "zh-Hans": "Merge towards Destination 1" + "eo": "Enveturu rekten direkte al Destination 1", + "es": "Gire a recto hacia Destination 1", + "es-ES": "Incorpórate recto hacia Destination 1", + "fr": "Rejoindre tout droit en direction de Destination 1", + "id": "Bergabung lurus menuju Destination 1", + "it": "Immettiti dritto verso Destination 1", + "nl": "Bij de splitsing rechtdoor richting Destination 1", + "pl": "Włącz się prosto w kierunku Destination 1", + "pt-BR": "Entre reto em direção à Destination 1", + "ro": "Intrați în înainte spre Destination 1", + "ru": "Перестройтесь прямо в направлении Destination 1", + "sv": "Byt till rakt fram körfält mot Destination 1", + "tr": "Destination 1 istikametinde düz yöne gir", + "uk": "Приєднайтеся до потоку прямо у напрямку Destination 1", + "vi": "Nhập sang thẳng đến Destination 1", + "zh-Hans": "直行并道，前往Destination 1" } } diff --git a/test/fixtures/v5/merge/straight_name.json b/test/fixtures/v5/merge/straight_name.json index 849b1ff14..a02e3edcb 100644 --- a/test/fixtures/v5/merge/straight_name.json +++ b/test/fixtures/v5/merge/straight_name.json @@ -7,23 +7,23 @@ "name": "Way Name" }, "instructions": { - "de": "Merge onto Way Name", + "de": "Geradeaus auffahren auf Way Name", "en": "Merge onto Way Name", - "eo": "Merge onto Way Name", - "es": "Merge onto Way Name", - "es-ES": "Merge onto Way Name", - "fr": "Merge onto Way Name", - "id": "Merge onto Way Name", - "it": "Merge onto Way Name", - "nl": "Merge onto Way Name", - "pl": "Merge onto Way Name", - "pt-BR": "Merge onto Way Name", - "ro": "Merge onto Way Name", - "ru": "Merge onto Way Name", - "sv": "Merge onto Way Name", - "tr": "Merge onto Way Name", - "uk": "Merge onto Way Name", - "vi": "Merge onto Way Name", - "zh-Hans": "Merge onto Way Name" + "eo": "Enveturu rekten al Way Name", + "es": "Gire a recto en Way Name", + "es-ES": "Incorpórate recto por Way Name", + "fr": "Rejoindre tout droit sur Way Name", + "id": "Bergabung lurus ke arah Way Name", + "it": "Immettiti dritto in Way Name", + "nl": "Bij de splitsing rechtdoor naar Way Name", + "pl": "Włącz się prosto na Way Name", + "pt-BR": "Entre reto na Way Name", + "ro": "Intrați în înainte pe Way Name", + "ru": "Перестройтесь прямо на Way Name", + "sv": "Byt till rakt fram körfält in på Way Name", + "tr": "Way Name üzerinde düz yöne gir", + "uk": "Приєднайтеся до потоку прямо на Way Name", + "vi": "Nhập sang thẳng vào Way Name", + "zh-Hans": "直行并道，上Way Name" } }