Refactor translation strings for notes
These aren't used by any javascript code, so don't need to be in the `javascripts` key.
This commit is contained in:
Andy Allan
parent
9bb8dd739a
commit
a88da1d71a
3 changed files with 28 additions and 31 deletions
|
|
@ -3,15 +3,15 @@
|
|||
<%= render "sidebar_header", :title => t(".title") %>
|
||||
|
||||
<div class="note">
|
||||
<p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
|
||||
<p class="alert alert-info"><%= t(".intro") %></p>
|
||||
<form action="#">
|
||||
<input type="hidden" name="lon" autocomplete="off">
|
||||
<input type="hidden" name="lat" autocomplete="off">
|
||||
<div class="mb-3">
|
||||
<textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>
|
||||
<textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t(".advice") %>"></textarea>
|
||||
</div>
|
||||
<div class="btn-wrapper">
|
||||
<input type="submit" name="add" value="<%= t("javascripts.notes.new.add") %>" disabled="1" class="btn btn-primary">
|
||||
<input type="submit" name="add" value="<%= t(".add") %>" disabled="1" class="btn btn-primary">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</div>
|
||||
|
||||
<% if @note_comments.find { |comment| comment.author.nil? } -%>
|
||||
<p class='alert alert-warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
|
||||
<p class='alert alert-warning'><%= t ".anonymous_warning" %></p>
|
||||
<% end -%>
|
||||
|
||||
<% if @note_comments.length > 1 %>
|
||||
|
|
@ -49,13 +49,13 @@
|
|||
</div>
|
||||
<div class="btn-wrapper">
|
||||
<% if current_user.moderator? -%>
|
||||
<input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
||||
<input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
||||
<% end -%>
|
||||
<input type="submit" name="close" value="<%= t("javascripts.notes.show.resolve") %>" class="btn btn-primary"
|
||||
<input type="submit" name="close" value="<%= t(".resolve") %>" 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") %>">
|
||||
<input type="submit" name="comment" value="<%= t("javascripts.notes.show.comment") %>" 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") %>">
|
||||
<input type="submit" name="comment" value="<%= t(".comment") %>" class="btn btn-primary" data-method="POST" data-url="<%= comment_api_note_url(@note, "json") %>" disabled="1">
|
||||
</div>
|
||||
</form>
|
||||
<% end -%>
|
||||
|
|
@ -64,10 +64,10 @@
|
|||
<input type="hidden" name="text" value="" autocomplete="off">
|
||||
<div class="btn-wrapper">
|
||||
<% if @note.status != "hidden" and current_user and current_user.moderator? -%>
|
||||
<input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
||||
<input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
||||
<% end -%>
|
||||
<% if current_user -%>
|
||||
<input type="submit" name="reopen" value="<%= t("javascripts.notes.show.reactivate") %>" class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>">
|
||||
<input type="submit" name="reopen" value="<%= t(".reactivate") %>" class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>">
|
||||
<% end -%>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -76,11 +76,11 @@
|
|||
<% if current_user && current_user != @note.author %>
|
||||
<p>
|
||||
<small class="text-muted">
|
||||
<%= 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 %>
|
||||
</small>
|
||||
</p>
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
|
||||
<% if @note.freshly_closed? %>
|
||||
<small class="text-muted">
|
||||
<%= t "javascripts.notes.show.disappear_date_html", :disappear_in => disappear_in(@note) %>
|
||||
<%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %>
|
||||
</small>
|
||||
<% end %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2836,8 +2836,21 @@ en:
|
|||
hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
|
||||
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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue