From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 8 Feb 2023 14:01:41 +0000 (+0000)
Subject: Move public editing content into its own partial
X-Git-Tag: live~1350^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e11c70f751b69d2d675064d1952cd01d069b4654

Move public editing content into its own partial

This makes the editing page easier to read, and simplifies the i18n
in the public editing section.
---

diff --git a/app/views/accounts/_go_public.html.erb b/app/views/accounts/_go_public.html.erb
new file mode 100644
index 000000000..af3667e65
--- /dev/null
+++ b/app/views/accounts/_go_public.html.erb
@@ -0,0 +1,14 @@
+<hr class="mb-3" />
+<a name="public"></a>
+<h2><%= t ".heading" %></h2>
+<p>
+  <%= t ".currently_not_public" %>
+  <strong><%= t ".only_public_can_edit" %></strong>
+  <%= t ".find_out_why_html", :link => link_to(t(".find_out_why"),
+                                               t(".find_out_why_url")) %>
+</p>
+<ul>
+  <li><%= t ".email_not_revealed" %></li>
+  <li><%= t ".not_reversible" %></li>
+</ul>
+<%= button_to t(".make_edits_public_button"), user_go_public_path, :class => "btn btn-primary" %>
diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index 2fae4640a..e783367dd 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -65,18 +65,5 @@
 <% end %>
 
 <% unless current_user.data_public? %>
-  <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" %>
+  <%= render :partial => "go_public" %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 28509baa1..7ed1eb10a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -273,15 +273,6 @@ en:
         enabled link text: "what is this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
-      public editing note:
-        heading: "Public editing"
-        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."
@@ -291,8 +282,17 @@ en:
         link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
       save changes button: Save Changes
-      make edits public button: Make all my edits public
       delete_account: Delete Account...
+    go_public:
+      heading: "Public editing"
+      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.
+      make_edits_public_button: Make all my edits public
     update:
       success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       success: "User information updated successfully."