Rework geocoder titles to avoid raw html in translations

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index ceb099421a1ee2ef6e1cbf878b489a6669411b41..86048b0ad8b272fa5efef49c5b934ed70f0b4de0 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -3,7 +3,10 @@
 <%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
 
 <% @sources.each do |source| %>
 <%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
 
 <% @sources.each do |source| %>

-  <h4><%= t(".title.#{source}_html") %></h4>
+  <h4>
+    <%= t(".title.results_from_html", :results_link => link_to(t(".title.#{source}"),
+                                                               t(".title.#{source}_url"))) %>
+  </h4>

   <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
     <div class="text-center loader">
       <div class="spinner-border" role="status">
   <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
     <div class="text-center loader">
       <div class="spinner-border" role="status">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d64c1178278b300616a94198e66a1a55df56d154..afc578b6940a3bc74fc20637cb4a586901f662db 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -590,9 +590,13 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        results_from_html: 'Results from %{results_link}'
+        latlon: Internal
+        latlon_url: https://openstreetmap.org/
+        osm_nominatim: OpenStreetMap Nominatim
+        osm_nominatim_url: https://nominatim.openstreetmap.org/
+        osm_nominatim_reverse: OpenStreetMap Nominatim
+        osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix: