X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb75f447d72ca3c913a195f97abeba64c9142172..a2ff9b38f8b0c9c24ea692eaf7e1b4c21caf18b5:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 58370e9e3..7bd0891a3 100644 --- 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,20 +264,20 @@ OSM.Directions = function (map) { if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { distanceText.append( $("
"), - 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 = $(""); - var directionsCloseButton = $("