From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 8 Feb 2023 13:55:33 +0000 (+0000)
Subject: Refactor public editing note to avoid raw html in the translations
X-Git-Tag: live~834^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c7e9888bb6587649109d0c8d9e00c771da867cf9

Refactor public editing note to avoid raw html in the translations
---

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index 7aad944d3..2fae4640a 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -65,8 +65,18 @@
 <% end %>
 
 <% unless current_user.data_public? %>
-<a name="public"></a>
-<h2><%= t ".public editing note.heading" %></h2>
-<%= t ".public editing note.html" %>
-<%= button_to t(".make edits public button"), user_go_public_path, :class => "btn btn-primary" %>
+  <hr class="mb-3" />
+  <a name="public"></a>
+  <h2><%= t ".public editing note.heading" %></h2>
+  <p>
+    <%= t ".public editing note.currently_not_public" %>
+    <strong><%= t ".public editing note.only_public_can_edit" %></strong>
+    <%= t ".public editing note.find_out_why_html", :link => link_to(t(".public editing note.find_out_why"),
+                                                                     t(".public editing note.find_out_why_url")) %>
+  </p>
+  <ul>
+    <li><%= t ".public editing note.email_not_revealed" %></li>
+    <li><%= t ".public editing note.not_reversible" %></li>
+  </ul>
+  <%= button_to t(".make edits public button"), user_go_public_path, :class => "btn btn-primary" %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40eb533a2..28509baa1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -275,7 +275,13 @@ en:
         disabled link text: "why can't I edit?"
       public editing note:
         heading: "Public editing"
-        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+        currently_not_public: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below."
+        only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data.
+        find_out_why_html: (%{link}).
+        find_out_why: "find out why"
+        find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        email_not_revealed: Your email address will not be revealed by becoming public.
+        not_reversible: This action cannot be reversed and all new users are now public by default.
       contributor terms:
         heading: "Contributor Terms"
         agreed: "You have agreed to the new Contributor Terms."