cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3889 from tomhughes/distances

Browse source 
Make distances in directions translatable
This commit is contained in:
Andy Allan 2023-01-11 10:47:19 +00:00 • committed by GitHub
commit 0649e9cdbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/index/directions.js
View file

@ -169,14 +169,18 @@ OSM.Directions = function (map) {
function formatDistance(m) { function formatDistance(m) {
if (m < 1000) { if (m < 1000) {
return Math.round(m) + "m"; return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });
} else if (m < 10000) { } 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 { } 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) { function formatTime(s) {
var m = Math.round(s / 60); var m = Math.round(s / 60);
var h = Math.floor(m / 60); var h = Math.floor(m / 60);
@ -260,8 +264,8 @@ OSM.Directions = function (map) {
if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
distanceText.append( distanceText.append(
$("<br>"), $("<br>"),
I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " + I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."); I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");
} }
var turnByTurnTable = $("<table class='mb-3'>"); var turnByTurnTable = $("<table class='mb-3'>");

2
config/locales/en.yml
View file

@ -2949,6 +2949,8 @@ en:
descend: "Descend" descend: "Descend"
directions: "Directions" directions: "Directions"
distance: "Distance" distance: "Distance"
distance_m: "%{distance}m"
distance_km: "%{distance}km"
errors: errors:
no_route: "Couldn't find a route between those two places." no_route: "Couldn't find a route between those two places."
no_place: "Sorry - couldn't locate '%{place}'." no_place: "Sorry - couldn't locate '%{place}'."