X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/effb1b7f4170bb7244c4dfffcbe6134fe00e2bc4..b38343e5bd95230c6bb2159700102dbca247fa03:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 1fb1e74a4..1328461d7 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,13 +1,8 @@ -<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> +<% set_title(t('.title', :id => @changeset.id)) %>

- <%= t('browse.changeset.title', :id => @changeset.id) %> - <% if current_user and current_user.id != @changeset.user.id %> - <%= link_to new_issue_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name, referer: request.fullpath), :title => t('browse.changeset.report') do %> -  ⚐ - <% end %> - <% end %> + <%= t('.title', :id => @changeset.id) %>

@@ -16,17 +11,19 @@ <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> -

<%= t('browse.changeset.discussion') %>

+

<%= t('.discussion') %>

-
-
- <% if current_user and @changeset.subscribers.exists?(current_user.id) %> - - <% else %> - - <% end %> -
-
+ <% if current_user %> +
+
+ <% if @changeset.subscribers.exists?(current_user.id) %> + + <% else %> + + <% end %> +
+
+ <% end %>
@@ -38,10 +35,9 @@ <% if comment.visible %>
  • - <%= t("browse.changeset.commented_by", + <%= t(".commented_by", :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view", - :display_name => comment.author.display_name})).html_safe %> + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> <% if current_user and current_user.moderator? %> — <%= t('javascripts.changesets.show.hide_comment') %> <% end %> @@ -51,10 +47,9 @@ <% elsif current_user and current_user.moderator? %>
  • - <%= t("browse.changeset.hidden_commented_by", + <%= t(".hidden_commented_by", :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view", - :display_name => comment.author.display_name})).html_safe %> + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> — <%= t('javascripts.changesets.show.unhide_comment') %> <%= comment.body.to_html %> @@ -66,17 +61,25 @@
  • <% end %> -
    - <%= link_to(t("browse.changeset.join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %> -
    + <% unless current_user %> +
    + <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %> +
    + <% end %> - <% unless @changeset.is_open? %> -
    - -
    - + <% if current_user %> + <% unless @changeset.is_open? %> + + +
    + +
    + + <% else %> +
    + <%= t('.still_open') %>
    - + <% end %> <% end %> <% unless @ways.empty? %> @@ -124,7 +127,7 @@ <% end %> <%= user = (@prev_by_user || @next_by_user).user.display_name - link_to content_tag(:bdi, user), :controller => "changeset", :action => "list", :display_name => user + link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %> <% if @next_by_user %> · @@ -134,7 +137,7 @@ <% end %>
    - <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> + <%= link_to(t('.changesetxml'), :controller => "api/changesets", :action => "show") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t('.osmchangexml'), :controller => "api/changesets", :action => "download") %>