From: Andy Allan Date: Thu, 26 Jan 2023 11:36:09 +0000 (+0000) Subject: Refactor translation strings for notes X-Git-Tag: live~1429^2~1 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a88da1d71af3a095e5496937e04731ed5d5632fe Refactor translation strings for notes These aren't used by any javascript code, so don't need to be in the `javascripts` key. --- diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb index 7b3b807e3..ee9837056 100644 --- a/app/views/notes/new.html.erb +++ b/app/views/notes/new.html.erb @@ -3,15 +3,15 @@ <%= render "sidebar_header", :title => t(".title") %>
-

<%= t("javascripts.notes.new.intro") %>

+

<%= t(".intro") %>

- +
- " disabled="1" class="btn btn-primary"> + " disabled="1" class="btn btn-primary">
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb index 980b5062c..71cb1275d 100644 --- a/app/views/notes/show.html.erb +++ b/app/views/notes/show.html.erb @@ -25,7 +25,7 @@ <% if @note_comments.find { |comment| comment.author.nil? } -%> -

<%= t "javascripts.notes.show.anonymous_warning" %>

+

<%= t ".anonymous_warning" %>

<% end -%> <% if @note_comments.length > 1 %> @@ -49,13 +49,13 @@
<% if current_user.moderator? -%> - " class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>"> + " class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>"> <% end -%> - " class="btn btn-primary" + " class="btn btn-primary" data-method="POST" data-url="<%= close_api_note_url(@note, "json") %>" - data-default-action-text="<%= t("javascripts.notes.show.resolve") %>" - data-comment-action-text="<%= t("javascripts.notes.show.comment_and_resolve") %>"> - " class="btn btn-primary" data-method="POST" data-url="<%= comment_api_note_url(@note, "json") %>" disabled="1"> + data-default-action-text="<%= t(".resolve") %>" + data-comment-action-text="<%= t(".comment_and_resolve") %>"> + " class="btn btn-primary" data-method="POST" data-url="<%= comment_api_note_url(@note, "json") %>" disabled="1">
<% end -%> @@ -64,10 +64,10 @@
<% if @note.status != "hidden" and current_user and current_user.moderator? -%> - " class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>"> + " class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>"> <% end -%> <% if current_user -%> - " class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>"> + " class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>"> <% end -%>
@@ -76,11 +76,11 @@ <% if current_user && current_user != @note.author %>

- <%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %> + <%= t ".report_link_html", :link => report_link(t(".report"), @note) %> <% if @note.status == "open" %> - <%= t "javascripts.notes.show.other_problems_resolve", :link => report_link(t(".report"), @note) %> + <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %> <% elsif @note.status == "closed" %> - <%= t "javascripts.notes.show.other_problems_resolved" %> + <%= t ".other_problems_resolved" %> <% end %>

@@ -88,7 +88,7 @@ <% if @note.freshly_closed? %> - <%= t "javascripts.notes.show.disappear_date_html", :disappear_in => disappear_in(@note) %> + <%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6a405170d..40eb533a2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2836,8 +2836,21 @@ en: hidden_by_html: "Hidden by %{user} %{when}" report: report this note coordinates_html: "%{latitude}, %{longitude}" + anonymous_warning: This note includes comments from anonymous users which should be independently verified. + hide: Hide + resolve: Resolve + reactivate: Reactivate + comment_and_resolve: Comment & Resolve + comment: Comment + report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." + other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." + other_problems_resolved: "For all other problems, resolving is sufficient." + disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." new: title: "New Note" + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." + advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." + add: Add Note javascripts: close: Close share: @@ -2915,22 +2928,6 @@ en: unsubscribe: "Unsubscribe" hide_comment: "hide" unhide_comment: "unhide" - notes: - new: - intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." - advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." - add: Add Note - show: - anonymous_warning: This note includes comments from anonymous users which should be independently verified. - hide: Hide - resolve: Resolve - reactivate: Reactivate - comment_and_resolve: Comment & Resolve - comment: Comment - report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." - other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." - other_problems_resolved: "For all other problems, resolving is sufficient." - disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend"