Added exit counts as seperate keys in locale file

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index 6e7a6deb71955020f9a4ea53e1f30194a9267037..e249ce1f56311c29f3119d5785484bc9adb3090a 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -60,19 +60,11 @@ function OSRMEngine() {
         'depart': 8,
         'arrive': 14
       };
         'depart': 8,
         'arrive': 14
       };

-      var convertExitNumber = function(exitNum) {
-        var j = exitNum % 10,
-        k = exitNum % 100;
-        if (j === 1 && k !== 11) {
-            return exitNum + "st";
+      var numToWord = function(num) {
+        if(num > 10) {
+          num = 11;

         }
         }

-        if (j === 2 && k !== 12) {
-            return exitNum + "nd";
-        }
-        if (j === 3 && k !== 13) {
-            return exitNum + "rd";
-        }
-        return exitNum + "th";
+        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;
       };
       var transformed_steps = input_steps.map(function(step, idx) {
         var maneuver_id;


@@ -126,7 +118,7 @@ function OSRMEngine() {
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
           if (step.maneuver.exit) {
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
           if (step.maneuver.exit) {

-            instText += I18n.t(template + '_with_exit', { exit: convertExitNumber(step.maneuver.exit), name: name } );
+            instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } );

           } else {
             instText += I18n.t(template + '_without_exit', { name: name } );
           }
           } else {
             instText += I18n.t(template + '_without_exit', { name: name } );
           }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 329718571f7048b73285c097089fa0eae5fd5f19..2c1ac016930c91787b78b793893e67cfacbfac9d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2382,6 +2382,18 @@ en:
         continue_with_exit: At roundabout continue straight onto %{name}
         unnamed: "unnamed road"
         courtesy: "Directions courtesy of %{link}"
         continue_with_exit: At roundabout continue straight 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"
+          gt_ten: ""

       time: "Time"
     query:
       node: Node
       time: "Time"
     query:
       node: Node