Refactor potlatch page to avoid html in translations

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 790a3bf5d057497713a449e9eb930ca217ee5459..909a4cb414a707fc22cc744f40109dbb5c81bb13 100644 (file)
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,5 +1,5 @@
 <div class="container">
   <p><%= t ".removed" %></p>
-  <p><%= t ".desktop_html" %></p>
-  <p><%= t ".id_html", :settings_url => preferences_path %></p>
+  <p><%= t ".desktop_application_html", :download_link => link_to(t(".download"), t(".download_url")) %></p>
+  <p><%= t ".id_editor_html", :change_preferences_link => link_to(t(".change_preferences"), preferences_path) %></p>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fc01c22ae50c343d5c2213c3ef20a9c6d11d998b..0a64eaccdf3c4eecc388fb70adf803a800b3d4cc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2158,8 +2158,11 @@ en:
         description: Browse the wiki for in-depth OpenStreetMap documentation.
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
-      desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
+      desktop_application_html: You can still use Potlatch by %{download_link}.
+      download: downloading the desktop application for Mac and Windows
+      download_url: https://www.systemed.net/potlatch/
+      id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}.
+      change_preferences: Change your preferences here
     any_questions:
       title: Any questions?
       paragraph_1_html: |