X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f03522c427ff030b8147a800a630a9082de3da7..f91dd6afc21fdf17cd9c3fa71784540d3f245ddf:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 68beefeb6..a2169643f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -108,9 +108,9 @@ $(document).ready(function () { iconLoading: "icon geolocate", strings: { 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: function (options) { + return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance }); + } } }).addTo(map); @@ -189,7 +189,7 @@ $(document).ready(function () { map._object); $.removeCookie("_osm_location"); - $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); + $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" }); }); if ($.cookie("_osm_welcome") !== "hide") { @@ -198,7 +198,7 @@ $(document).ready(function () { $(".welcome .close").on("click", function () { $(".welcome").removeClass("visible"); - $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" }); + $.cookie("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/" }); }); var bannerExpiry = new Date(); @@ -209,7 +209,7 @@ $(document).ready(function () { $("#banner").hide(); e.preventDefault(); if (cookieId) { - $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" }); + $.cookie(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/" }); } });