<% set_title(t(".title", :id => @changeset.id)) %>
- <h2>
- <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
- <%= t(".title", :id => @changeset.id) %>
- </h2>
+ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
<div class="browse-section">
<p class="font-italic">
<% if comment.visible %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
- <%= t(".commented_by",
+ <%= t(".commented_by_html",
:when => friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at),
- :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
+ :user => link_to(comment.author.display_name, user_path(comment.author))) %>
<% if current_user and current_user.moderator? %>
— <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
<% end %>
<% elsif current_user and current_user.moderator? %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
- <%= t(".hidden_commented_by",
+ <%= t(".hidden_commented_by_html",
:when => friendly_date_ago(comment.created_at),
:exact_time => l(comment.created_at),
- :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %>
+ :user => link_to(comment.author.display_name, user_path(comment.author))) %>
— <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
</small>
<%= comment.body.to_html %>
relation: "Relations (%{count})"
relation_paginated: "Relations (%{x}-%{y} of %{count})"
comment: "Comments (%{count})"
- hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
- commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ hidden_commented_by
_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by
_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
feed:
entry_html: "Relation %{relation_name}"
entry_role_html: "Relation %{relation_name} (as %{relation_role})"
not_found:
+ title: Not Found
sorry: "Sorry, %{type} #%{id} could not be found."
type:
node: node
changeset: changeset
note: note
timeout:
+ title: Timeout Error
sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
type:
node: node
open_title: "Unresolved note #%{note_name}"
closed_title: "Resolved note #%{note_name}"
hidden_title: "Hidden note #%{note_name}"
- opened_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
- opened_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
- commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
- commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
- closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
- closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
- reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
- reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
- hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ opened_by
_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ opened_by_anonymous
_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by
_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ commented_by_anonymous
_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ closed_by
_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ closed_by_anonymous
_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ reopened_by
_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+ reopened_by_anonymous
_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+ hidden_by
_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
report: Report this note
coordinates_html: "%{latitude}, %{longitude}"
query:
level8: "City Boundary"
level9: "Village Boundary"
level10: "Suburb Boundary"
- description:
- title:
- osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
- geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
types:
cities: Cities
towns: Towns
text: Make a Donation
learn_more: "Learn More"
more: More
- notifier:
+ user_mailer:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on a diary entry"
hi: "Hi %{to_user},"
<p>Unlike other maps, OpenStreetMap is completely created by people like you,
and it's free for anyone to fix, update, download and use.</p>
<p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
- license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
confirm_resend:
- success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
+ success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
failure: "User %{name} not found."
confirm_email:
heading: Confirm a change of email address
projects / rails.git / commitdiff