Avoid concatenating text to a translation

Fixes #3064

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index c4a5d026580df296205c3c2bb86799bd292b773e..8705f47ffa3a96e321598d8ace9a18d0c99c5606 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -222,9 +222,14 @@ L.OSM.share = function (options) {
       .attr("type", "hidden")
       .appendTo($form);
 
       .attr("type", "hidden")
       .appendTo($form);
 

+    var args = {
+      width: "<span id=\"mapnik_image_width\"></span>",
+      height: "<span id=\"mapnik_image_height\"></span>"
+    };
+

     $("<p>")
       .attr("class", "text-muted")
     $("<p>")
       .attr("class", "text-muted")

-      .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
+      .html(I18n.t("javascripts.share.image_dimensions", args))

       .appendTo($form);
 
     $("<input>")
       .appendTo($form);
 
     $("<input>")

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 24f2348c160d150457b5c221c69ecd92995ed8cb..ea24854c66db2c3d51c5cf8e4719243fac079c52 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2667,7 +2667,7 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"

-      image_size: "Image will show standard layer at "
+      image_dimensions: "Image will show standard layer at %{width} x %{height}"

       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"