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

diff --git a/app/views/diary_comments/_page.html.erb b/app/views/diary_comments/_page.html.erb
index 66e40cd805733223825fc3bd731cd4ac297bb481..cc6019cff5f7ac7b8a57d4b2bdeef8b3936339f3 100644 (file)
--- a/app/views/diary_comments/_page.html.erb
+++ b/app/views/diary_comments/_page.html.erb
@@ -19,8 +19,6 @@
   </table>
 
   <%= render "shared/pagination",
-             :newer_key => "diary_comments.page.newer_comments",
-             :older_key => "diary_comments.page.older_comments",
              :newer_id => @newer_comments_id,
              :older_id => @older_comments_id %>
 </turbo-frame>

diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb
index f07db9b6c73c953f0172f28b202e3b4a2b6f8f6f..c44a5417ea4538c8005322f9925c232a3ad1a4a6 100644 (file)
--- a/app/views/diary_entries/_page.html.erb
+++ b/app/views/diary_entries/_page.html.erb
@@ -4,8 +4,6 @@
   <%= render @entries %>
 
   <%= render "shared/pagination",
-             :newer_key => "diary_entries.page.newer_entries",
-             :older_key => "diary_entries.page.older_entries",
              :newer_id => @newer_entries_id,
              :older_id => @older_entries_id %>
 </turbo-frame>

diff --git a/app/views/issues/_page.html.erb b/app/views/issues/_page.html.erb
index b46b1798c96e2d3723b09065b947ace78208d20f..f625f0e0434ece3dcf3e8f244f65cfd50e6c30ab 100644 (file)
--- a/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@ -36,8 +36,6 @@
       </tbody>
     </table>
     <%= render "shared/pagination",
-               :newer_key => "issues.page.newer_issues",
-               :older_key => "issues.page.older_issues",
                :newer_id => @newer_issues_id,
                :older_id => @older_issues_id %>
   <% end %>

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index c8eddcd379b9ca414d44f24b45ffdee99b0f901a..f10d0a9dc36648527306da667cdb764494c71d37 100644 (file)
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -1,9 +1,10 @@
+<% 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" %>
-      <%= t(newer_key) %>
+      <%= t :newer, :scope => translation_scope %>
     <% end %>
     <% if newer_id -%>
       <li class="page-item d-flex">
@@ -16,7 +17,7 @@
     <% 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 -%>

diff --git a/app/views/traces/_page.html.erb b/app/views/traces/_page.html.erb
index e1ce3fe48604a897b201f1beeb40837ad9a8b982..422da553408cc73c4b2fcd5f21d09104f412fa2d 100644 (file)
--- a/app/views/traces/_page.html.erb
+++ b/app/views/traces/_page.html.erb
@@ -1,7 +1,5 @@
 <turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
-             :newer_key => "traces.page.newer",
-             :older_key => "traces.page.older",
              :newer_id => @newer_traces_id,
              :older_id => @older_traces_id %>
 
@@ -12,8 +10,6 @@
   </table>
 
   <%= render "shared/pagination",
-             :newer_key => "traces.page.newer",
-             :older_key => "traces.page.older",
              :newer_id => @newer_traces_id,
              :older_id => @older_traces_id %>
 </turbo-frame>

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index de6feafa1e4d6ee695cedd90741ee9a34f67520a..8c8557f606e358b196d170209ecbb5779947ccd1 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -19,8 +19,6 @@
   </table>
 
   <%= render "shared/pagination",
-             :newer_key => "user_blocks.blocks.newer",
-             :older_key => "user_blocks.blocks.older",
              :newer_id => @newer_user_blocks_id,
              :older_id => @older_user_blocks_id %>
 </turbo-frame>

diff --git a/app/views/users/_page.html.erb b/app/views/users/_page.html.erb
index 8a58a29b7f0d0204cf0cd5f8479fc7815d6c26d8..e505474e1c1019e1cec411818ae82584fa8e680e 100644 (file)
--- a/app/views/users/_page.html.erb
+++ b/app/views/users/_page.html.erb
@@ -3,8 +3,6 @@
     <div class="row">
       <div class="col">
         <%= render "shared/pagination",
-                   :newer_key => "users.page.newer",
-                   :older_key => "users.page.older",
                    :newer_id => @newer_users_id,
                    :older_id => @older_users_id %>
       </div>
@@ -32,8 +30,6 @@
     <div class="row">
       <div class="col">
         <%= render "shared/pagination",
-                   :newer_key => "users.page.newer",
-                   :older_key => "users.page.older",
                    :newer_id => @newer_users_id,
                    :older_id => @older_users_id %>
       </div>

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 27beb4fb34994ca09f94a74b3f3f5bd695f15c82..01e70529d6af8409f9300075aa3c6c9424781bf0 100644 (file)
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -129,6 +129,7 @@ ignore_unused:
   - 'helpers.submit.*'
   - 'datetime.distance_in_words_ago.*'
   - 'reports.new.categories.*' # double interpolation in reports_helper
+  - 'shared.pagination.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 083c2e42c84d3e7a41186bb1dbe0fb7dd9609333..97d5e6f003e5d18737ea5f92e07ef2ff6293af53 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -535,8 +535,6 @@ en:
       no_entries: No diary entries
     page:
       recent_entries: "Recent diary entries"
-      older_entries: Older Entries
-      newer_entries: Newer Entries
     edit:
       title: Edit Diary Entry
       marker_text: Diary entry location
@@ -604,8 +602,6 @@ en:
       post: Post
       when: When
       comment: Comment
-      newer_comments: "Newer Comments"
-      older_comments: "Older Comments"
     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:
@@ -1482,8 +1478,6 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
-      older_issues: Older Issues
-      newer_issues: Newer Issues
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
@@ -1895,6 +1889,25 @@ en:
       edit: Edit
       preview: Preview
       help: Help
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      issues:
+        older: Older Issues
+        newer: Newer Issues
+      traces:
+        older: Older Traces
+        newer: Newer Traces
+      user_blocks:
+        older: Older Blocks
+        newer: Newer Blocks
+      users:
+        older: Older Users
+        newer: Newer Users
   site:
     about:
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
@@ -2537,9 +2550,6 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
-    page:
-      older: "Older Traces"
-      newer: "Newer Traces"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     offline_warning:
@@ -2793,8 +2803,6 @@ en:
       summary_no_ip_html: "%{name} created on %{date}"
       empty: No matching users found
     page:
-      older: "Older Users"
-      newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
@@ -2929,8 +2937,6 @@ en:
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
-      older: "Older Blocks"
-      newer: "Newer Blocks"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 4d6d9519bf725215efa722c30632cda810d3863f..eae3322ff56c7c308f890f6da2ccab533c0dc016 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -183,7 +183,7 @@ class IssuesTest < ApplicationSystemTestCase
     end
 
     # Second Page
-    click_on I18n.t("issues.page.older_issues")
+    click_on "Older Issues"
     assert_no_content I18n.t("issues.page.user_not_found")
     assert_no_content I18n.t("issues.page.issues_not_found")
     4.upto(8).each do |n|
@@ -194,7 +194,7 @@ class IssuesTest < ApplicationSystemTestCase
     end
 
     # Back to First Page
-    click_on I18n.t("issues.page.newer_issues")
+    click_on "Newer Issues"
     assert_no_content I18n.t("issues.page.user_not_found")
     assert_no_content I18n.t("issues.page.issues_not_found")
     4.upto(8).each do |n|