cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move public editing content into its own partial

Browse source 
This makes the editing page easier to read, and simplifies the i18n
in the public editing section.
This commit is contained in:
Andy Allan 2023-02-08 14:01:41 +00:00
parent c7e9888bb6
commit e11c70f751
3 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/accounts/_go_public.html.erb Normal file
View file

@ -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" %>

15
app/views/accounts/edit.html.erb
View file

@ -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 %>

20
config/locales/en.yml
View file

@ -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."