Move comment changeset locale string out of javascripts

[rails.git] / app / views / changesets / show.html.erb

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index fdaf7654ceeb6180bd71abd9c6ff951634f71c7c..a30dc8c79ac18674878a96e2f9b5e0ec85aeeb7a 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -31,13 +31,13 @@
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">

-          <small class='text-muted'>
+          <small class='text-body-secondary'>

             <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                   :time_ago => friendly_date_ago(comment.created_at),
             <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                   :time_ago => friendly_date_ago(comment.created_at),

-                  :user => link_to(comment.author.display_name, user_path(comment.author)) %>
+                  :user => link_to(comment.author.display_name, comment.author) %>

             <% if current_user&.moderator? %>
               —
             <% if current_user&.moderator? %>
               —

-              <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
+              <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),

                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>


@@ -66,7 +66,12 @@
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         <div>
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         <div>

-          <button name="comment" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled class="btn btn-sm btn-primary"><%= t("javascripts.changesets.show.comment") %></button>
+          <%= tag.button t(".comment"),
+                         :class => "btn btn-primary",
+                         :name => "comment",
+                         :disabled => true,
+                         :data => { :method => "POST",
+                                    :url => changeset_comment_url(@changeset) } %>

         </div>
       </form>
     <% else %>
         </div>
       </form>
     <% else %>


@@ -125,7 +130,7 @@
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>

-      <%= link_to({ :id => @prev_by_user.id }, :class => "icon-link") do %>
+      <%= link_to @prev_by_user, :class => "icon-link" do %>

         <%= previous_page_svg_tag :height => 11 %>
         <%= @prev_by_user.id %>
       <% end %>
         <%= previous_page_svg_tag :height => 11 %>
         <%= @prev_by_user.id %>
       <% end %>


@@ -135,7 +140,7 @@
         link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;
         link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;

-      <%= link_to({ :id => @next_by_user.id }, :class => "icon-link") do %>
+      <%= link_to @next_by_user, :class => "icon-link" do %>

         <%= @next_by_user.id %>
         <%= next_page_svg_tag :height => 11 %>
       <% end %>
         <%= @next_by_user.id %>
         <%= next_page_svg_tag :height => 11 %>
       <% end %>