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

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

Browse source
This commit is contained in:
Tom Hughes 2019-12-29 19:16:33 +00:00
commit e0f3fdbac7
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index.js
View file

@ -109,6 +109,8 @@ $(document).ready(function () {
iconLoading: "icon geolocate", iconLoading: "icon geolocate",
strings: { strings: {
title: I18n.t("javascripts.map.locate.title"), title: I18n.t("javascripts.map.locate.title"),
metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
popup: I18n.t("javascripts.map.locate.popup") popup: I18n.t("javascripts.map.locate.popup")
} }
}).addTo(map); }).addTo(map);

2
app/assets/javascripts/user.js
View file

@ -18,6 +18,8 @@ $(document).ready(function () {
iconLoading: "icon geolocate", iconLoading: "icon geolocate",
strings: { strings: {
title: I18n.t("javascripts.map.locate.title"), title: I18n.t("javascripts.map.locate.title"),
metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
popup: I18n.t("javascripts.map.locate.popup") popup: I18n.t("javascripts.map.locate.popup")
} }
}).addTo(map); }).addTo(map);

2
config/locales/en.yml
View file

@ -2472,6 +2472,8 @@ en:
out: Zoom Out out: Zoom Out
locate: locate:
title: Show My Location title: Show My Location
metersUnit: meters
feetUnit: feet
popup: You are within {distance} {unit} of this point popup: You are within {distance} {unit} of this point
base: base:
standard: Standard standard: Standard