add condition for merge straight

lyzidiamond · allierowan · commit d6cdae54ff8a · 2017-10-26T15:49:31.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/test/languages_test.js b/test/languages_test.js
