Merge remote-tracking branch 'upstream/pull/5408'

[rails.git] / app / views / shared / _pagination.html.erb

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 67b69e8645f0134cd975b228598ed29a358f7961..547078c51158f5be69df8eaa3232f3b82c0e1b7e 100644 (file)
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,13 +1,16 @@
+<% if older_id || newer_id %>
+
+<% translation_scope ||= "shared.pagination.#{controller.controller_name}" %>

 <nav>
   <% link_class = "page-link icon-link text-center" %>
   <ul class="pagination">
     <% newer_link_content = capture do %>
       <%= previous_page_svg_tag :class => "flex-shrink-0 d-none d-sm-block" %>
 <nav>
   <% link_class = "page-link icon-link text-center" %>
   <ul class="pagination">
     <% newer_link_content = capture do %>
       <%= previous_page_svg_tag :class => "flex-shrink-0 d-none d-sm-block" %>

-      <%= t(newer_key) %>
+      <%= t :newer, :scope => translation_scope %>

     <% end %>
     <% if newer_id -%>
       <li class="page-item d-flex">
     <% end %>
     <% if newer_id -%>
       <li class="page-item d-flex">

-        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>

       </li>
     <% else -%>
       <li class="page-item d-flex disabled">
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">


@@ -16,12 +19,12 @@
     <% end -%>
 
     <% older_link_content = capture do %>
     <% end -%>
 
     <% older_link_content = capture do %>

-      <%= t(older_key) %>
+      <%= t :older, :scope => translation_scope %>

       <%= next_page_svg_tag :class => "flex-shrink-0 d-none d-sm-block" %>
     <% end %>
     <% if older_id -%>
       <li class="page-item d-flex">
       <%= next_page_svg_tag :class => "flex-shrink-0 d-none d-sm-block" %>
     <% end %>
     <% if older_id -%>
       <li class="page-item d-flex">

-        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>

       </li>
     <% else -%>
       <li class="page-item d-flex disabled">
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">


@@ -30,3 +33,5 @@
     <% end -%>
   </ul>
 </nav>
     <% end -%>
   </ul>
 </nav>

+
+<% end %>