Fix translation lookups for roundabout exits

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 4ce2d005feb4c9fed71b89748569d4fae3e5fd0e..81c62e1831252b31c3dff3b2457ef1bead75020b 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -32,6 +32,8 @@ function OSRMEngine() {
         'turn slight left': 'javascripts.directions.instructions.slight_left',
         'roundabout': 'javascripts.directions.instructions.roundabout',
         'rotary': 'javascripts.directions.instructions.roundabout',
         'turn slight left': 'javascripts.directions.instructions.slight_left',
         'roundabout': 'javascripts.directions.instructions.roundabout',
         'rotary': 'javascripts.directions.instructions.roundabout',

+        'exit roundabout': 'javascripts.directions.instructions.exit_roundabout',
+        'exit rotary': 'javascripts.directions.instructions.exit_roundabout',

         'depart': 'javascripts.directions.instructions.start',
         'arrive': 'javascripts.directions.instructions.destination',
       };
         'depart': 'javascripts.directions.instructions.start',
         'arrive': 'javascripts.directions.instructions.destination',
       };


@@ -57,6 +59,8 @@ function OSRMEngine() {
         'turn sharp left': 7,
         'roundabout': 10,
         'rotary': 10,
         'turn sharp left': 7,
         'roundabout': 10,
         'rotary': 10,

+        'exit roundabout': 10,
+        'exit rotary': 10,

         'depart': 8,
         'arrive': 14
       };
         'depart': 8,
         'arrive': 14
       };


@@ -79,6 +83,8 @@ function OSRMEngine() {
           case 'arrive':
           case 'roundabout':
           case 'rotary':
           case 'arrive':
           case 'roundabout':
           case 'rotary':

+          case 'exit roundabout':
+          case 'exit rotary':

             maneuver_id = step.maneuver.type;
             break;
           case 'roundabout turn':
             maneuver_id = step.maneuver.type;
             break;
           case 'roundabout turn':


@@ -113,7 +119,9 @@ function OSRMEngine() {
           namedRoad = false;
         }
 
           namedRoad = false;
         }
 

-        if (step.maneuver.type.match(/rotary|roundabout/)) {
+        if (step.maneuver.type.match(/exit (rotary|roundabout)/)) {
+          instText += I18n.t(template, { name: name });
+        } else if (step.maneuver.type.match(/rotary|roundabout/)) {

           if (step.maneuver.exit) {
             if (step.maneuver.exit <= 10) {
               instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name });
           if (step.maneuver.exit) {
             if (step.maneuver.exit <= 10) {
               instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name });

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15cc2dbf66971069510c82ff36c903fa84b2c8a4..7cb67e0c86b863b598d30df5bfeb1e6d7326d023 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2378,11 +2378,7 @@ en:
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}

-        turn_left_with_exit: Exit onto %{name}
-        slight_left_with_exit: Exit onto %{name}
-        turn_right_with_exit: Exit onto %{name}
-        slight_right_with_exit: Exit onto %{name}
-        continue_with_exit: Exit onto %{name}
+        exit_roundabout: Exit roundabout onto %{name}

         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
         exit_counts:
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
         exit_counts: