Make distances in directions translatable

Fixes #3888

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 75c647802b7a4ff42f3143a0e93f3ae3f535fdb3..7bd0891a34e920956f0e80c3ed12a0f59e4bd9f7 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -169,14 +169,18 @@ OSM.Directions = function (map) {
 
   function formatDistance(m) {
     if (m < 1000) {
-      return Math.round(m) + "m";
+      return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });
     } else if (m < 10000) {
-      return (m / 1000.0).toFixed(1) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: (m / 1000.0).toFixed(1) });
     } else {
-      return Math.round(m / 1000) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: Math.round(m / 1000) });
     }
   }
 
+  function formatHeight(m) {
+    return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });
+  }
+
   function formatTime(s) {
     var m = Math.round(s / 60);
     var h = Math.floor(m / 60);
@@ -260,8 +264,8 @@ OSM.Directions = function (map) {
       if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
         distanceText.append(
           $("<br>"),
-          I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
-          I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.");
+          I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
+          I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");
       }
 
       var turnByTurnTable = $("<table class='mb-3'>");

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b65a5cf4e0d8402e44880159d7a5e14a14ce039..c3a752e4ac4e35edcd551db4ace58a98a3b314f2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2949,6 +2949,8 @@ en:
       descend: "Descend"
       directions: "Directions"
       distance: "Distance"
+      distance_m: "%{distance}m"
+      distance_km: "%{distance}km"
       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't locate '%{place}'."