Merge remote-tracking branch 'upstream/pull/1802'

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 84f085c5a6c942cc16f0cc8fcb6344989d7ff2db..b49d93e065436afbe39d3fe8711c58a6ac18384c 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -60,6 +60,12 @@ function OSRMEngine() {
         'depart': 8,
         'arrive': 14
       };
+      var numToWord = function(num) {
+        if(num > 10) {
+          num = 11;
+        }
+        return ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "gt_ten"][num];
+      };
       var transformed_steps = input_steps.map(function(step, idx) {
         var maneuver_id;
 
@@ -112,9 +118,13 @@ function OSRMEngine() {
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
           if (step.maneuver.exit) {
-            instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } );
+            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 });
+            } else {
+              instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name });
+            }
           } else {
-            instText += I18n.t(template + '_without_exit', { name: name } );
+            instText += I18n.t(template + '_without_exit', { name: name });
           }
         } else if (step.maneuver.type.match(/on ramp|off ramp/)) {
           var params = {};

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd0317df11581af61fb24a2954041f264159d416..4dd1762e1900eab84a3c74065dbbca2d63cdf884 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2377,6 +2377,7 @@ en:
         against_oneway_without_exit: Go against one-way on %{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}
@@ -2384,6 +2385,17 @@ en:
         continue_with_exit: Exit onto %{name}
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
+        exit_counts:
+          one: "1st"
+          two: "2nd"
+          three: "3rd"
+          four: "4th"
+          five: "5th"
+          six: "6th"
+          seven: "7th"
+          eight: "8th"
+          nine: "9th"
+          ten: "10th"
       time: "Time"
     query:
       node: Node