X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ed84930283982062753e8fbd7323239d70dd1611..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 9fc7ec548..85b9515df 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,35 +1,29 @@
-<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+<% set_title(t('.title', :id => @changeset.id)) %>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t('browse.changeset.title', :id => @changeset.id) %>
-  <% if @user and @user.id != @changeset.user.id %>
-    <%= link_to new_issue_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name, reported_user_id: @changeset.user.id,referer: request.fullpath), :title => t('browse.changeset.report') do %>
-        &nbsp;&#9872;
-    <% end %>
-  <% end %>
+  <%= t('.title', :id => @changeset.id) %>
 </h2>
 
-
-
 <div class="browse-section">
   <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
-
   <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
 
-  <h4 class="comments-header"><%= t('browse.changeset.discussion') %></h4>
-  
-  <div class="buttons clearfix subscribe-buttons">
-    <form action="#" class="hide_unless_logged_in">
-      <% if @user and @changeset.subscribers.exists?(@user.id) %>
-        <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
-      <% else %>
-        <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
-      <% end %>
-    </form>
-  </div>
+  <h4 class="comments-header"><%= t('.discussion') %></h4>
+
+  <% if current_user %>
+    <div class="buttons clearfix subscribe-buttons">
+      <form action="#">
+        <% if @changeset.subscribers.exists?(current_user.id) %>
+          <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+        <% else %>
+          <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+        <% end %>
+      </form>
+    </div>
+  <% end %>
 
   <div class="clearfix"></div>
 
@@ -41,23 +35,21 @@
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
-                  <%= 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? %>
                     — <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 %>
                 </small>
                 <%= comment.body.to_html %>
               </li>
-            <% elsif @user and @user.moderator? %>
+            <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
-                  <%= 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 %>
                   — <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 %>
@@ -69,17 +61,25 @@
     </div>
   <% end %>
 
-  <div class="notice hide_if_logged_in">
-    <%= link_to(t("browse.changeset.join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
-  </div>
+  <% unless current_user %>
+    <div class="notice">
+      <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
+    </div>
+  <% end %>
 
-  <% unless @changeset.is_open? %>
-    <form action="#" class="hide_unless_logged_in">
-      <textarea class="comment" name="text" cols="40" rows="5"></textarea>
-      <div class="buttons clearfix">
-        <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+  <% if current_user %>
+    <% unless @changeset.is_open? %>
+      <form action="#">
+        <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+        <div class="buttons clearfix">
+          <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+        </div>
+      </form>
+    <% else %>
+      <div class="notice">
+      <%= t('.still_open') %>
       </div>
-    </form>
+    <% end %>
   <% end %>
 
   <% unless @ways.empty? %>
@@ -137,7 +137,7 @@
 <% end %>
 
 <div class='secondary-actions'>
-  <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %>
   &middot;
-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+  <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>
 </div>