X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16f5a5ac0c674b258996fcbde1c3fda2e651906a..7377cb63939f8743ca31e67ea3965c2b15d20057:/app/views/browse/changeset.html.erb?ds=inline diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index a33214a70..85b9515df 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,8 +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) %> + <%= t('.title', :id => @changeset.id) %>

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

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

- -
-
- <% if @user and @changeset.subscribers.exists?(@user.id) %> - - <% else %> - - <% end %> -
-
+

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

+ + <% if current_user %> +
+
+ <% if @changeset.subscribers.exists?(current_user.id) %> + + <% else %> + + <% end %> +
+
+ <% end %>
@@ -33,23 +35,21 @@ <% 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 %> - <% if @user and @user.moderator? %> + :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 %> <%= comment.body.to_html %>
  • - <% elsif @user and @user.moderator? %> + <% 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 %> @@ -61,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 => 'user', :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? %> @@ -129,7 +137,7 @@ <% end %>
    - <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> + <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>