pagy 8.0.0 → 9.0.0

data/lib/pagy.rb

@@ -3,150 +3,126 @@
 
 require 'pathname'
 
-# Core class
+# Top superclass: it should define only what's common to all the subclasses
 class Pagy
-  VERSION = '8.0.0'
-
-  # Root pathname to get the path of Pagy files like templates or dictionaries
+  VERSION = '9.0.0'
+
+  # Core default: constant for easy access, but mutable for customizable defaults
+  DEFAULT = { count_args: [:all], # rubocop:disable Style/MutableConstant
+              ends:       true,
+              limit:      20,
+              outset:     0,
+              page:       1,
+              page_param: :page,
+              size:       7 }  # AR friendly
+
+  # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root
-    @root ||= Pathname.new(__dir__).freeze
+    @root ||= Pathname.new(__dir__).parent.freeze
   end
 
-  # Core defult: constant for easy access, but mutable for customizable defaults
-  DEFAULT = { page:          1, # rubocop:disable Style/MutableConstant
-              items:         20,
-              outset:        0,
-              size:          7,
-              cycle:         false,
-              # backend/collection
-              count_args:    [:all],  # AR friendly
-              # backend/url
-              params:        {},
-              page_param:    :page,
-              fragment:      '',
-              request_path:  nil,
-              # frontend/helpers
-              anchor_string: nil }
-
-  attr_reader :count, :page, :items, :vars, :pages, :last, :offset, :in, :from, :to, :prev, :next, :params, :request_path
-
-  # Merge and validate the options, do some simple arithmetic and set the instance variables
-  def initialize(vars)
-    normalize_vars(vars)
-    setup_vars(count: 0, page: 1, outset: 0)
-    setup_items_var
-    setup_pages_var
-    setup_offset_var
-    setup_params_var
-    setup_request_path_var
-    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
-
-    @from = [@offset - @outset + 1, @count].min
-    @to   = [@offset - @outset + @items, @count].min
-    @in   = [@to - @from + 1, @count].min
-    @prev = (@page - 1 unless @page == 1)
-    @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
-  end
+  # Shared with Keyset
+  module SharedMethods
+    attr_reader :page, :limit, :vars
 
-  # Return the array of page numbers and :gap items e.g. [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-  def series(size: @vars[:size], **_)
-    series = []
-    if size.is_a?(Array) && size.size == 4 && size.all? { |num| !num.negative? rescue false } # rubocop:disable Style/RescueModifier
-      # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
-      left_gap_start  =     1 + size[0]
-      left_gap_end    = @page - size[1] - 1
-      right_gap_start = @page + size[2] + 1
-      right_gap_end   = @last - size[3]
-      left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
-      right_gap_start = left_gap_start if left_gap_start > right_gap_start
-      start           = 1
-      if (left_gap_end - left_gap_start).positive?
-        series.push(*start...left_gap_start, :gap)
-        start = left_gap_end + 1
-      end
-      if (right_gap_end - right_gap_start).positive?
-        series.push(*start...right_gap_start, :gap)
-        start = right_gap_end + 1
+    # Validates and assign the passed vars: var must be present and value.to_i must be >= to min
+    def assign_and_check(name_min)
+      name_min.each do |name, min|
+        raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
+              unless @vars[name]&.respond_to?(:to_i) && \
+                     instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
       end
-      series.push(*start..@last)
-    elsif size.is_a?(Integer) && size.positive?    # only central series
-      # The simplest and fastest algorithm
-      size  = @pages if size > @pages              # reduce the max size to @pages
-      left  = ((size - 1) / 2.0).floor             # left half might be 1 page shorter for even size
-      start = if @page <= left                     # beginning pages
-                1
-              elsif @page > @pages - (size - left) # end pages
-                @pages - size + 1
-              else                                 # intermediate pages
-                @page - left
-              end
-      series = (start..start + size - 1).to_a
-    else
-      return [] if size.empty?
-
-      raise VariableError.new(self, :size, 'to be a single positive Integer or an Array of 4', size)
     end
-    series[series.index(@page)] = @page.to_s
-    series
-  end
 
-  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
-  def label_for(page)
-    page.to_s
-  end
+    # Assign @limit (overridden by the gearbox extra)
+    def assign_limit
+      assign_and_check(limit: 1)
+    end
 
-  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
-  def label
-    @page.to_s
+    # Assign @vars
+    def assign_vars(default, vars)
+      @vars = { **default, **vars.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') } }
+    end
   end
+  include SharedMethods
 
-  protected
-
-  # Apply defaults, cleanup blanks and set @vars
-  def normalize_vars(vars)
-    @vars = DEFAULT.merge(vars.delete_if { |k, v| DEFAULT.key?(k) && (v.nil? || v == '') })
-  end
+  attr_reader :count, :from, :in, :last, :next, :offset, :prev, :to
+  alias pages last
 
-  # Setup and validates the passed vars: var must be present and value.to_i must be >= to min
-  def setup_vars(name_min)
-    name_min.each do |name, min|
-      raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-            unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
-    end
+  # Merge and validate the options, do some simple arithmetic and set the instance variables
+  def initialize(**vars)
+    assign_vars(DEFAULT, vars)
+    assign_and_check(count: 0, page: 1, outset: 0)
+    assign_limit
+    assign_offset
+    assign_last
+    check_overflow
+    @from = [@offset - @outset + 1, @count].min
+    @to   = [@offset - @outset + @limit, @count].min
+    @in   = [@to - @from + 1, @count].min
+    assign_prev_and_next
   end
 
-  # Setup @items (overridden by the gearbox extra)
-  def setup_items_var
-    setup_vars(items: 1)
+  # Setup @last (overridden by the gearbox extra)
+  def assign_last
+    @last = [(@count.to_f / @limit).ceil, 1].max
+    @last = @vars[:max_pages] if @vars[:max_pages] && @last > vars[:max_pages]
   end
 
-  # Setup @pages and @last (overridden by the gearbox extra)
-  def setup_pages_var
-    @pages = @last = [(@count.to_f / @items).ceil, 1].max
+  # Assign @offset (overridden by the gearbox extra)
+  def assign_offset
+    @offset = (@limit * (@page - 1)) + @outset  # may be already set from gear_box
   end
 
-  # Setup @offset based on the :gearbox_items variable
-  def setup_offset_var
-    @offset = (@items * (@page - 1)) + @outset  # may be already set from gear_box
+  # Assign @prev and @next
+  def assign_prev_and_next
+    @prev = (@page - 1 unless @page == 1)
+    @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
   end
 
-  # Setup and validate @params
-  def setup_params_var
-    raise VariableError.new(self, :params, 'must be a Hash or a Proc', @params) \
-          unless (@params = @vars[:params]).is_a?(Hash) || @params.is_a?(Proc)
+  # Checks the @page <= @last
+  def check_overflow
+    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
   end
 
-  def setup_request_path_var
-    request_path = @vars[:request_path]
-    return if request_path.to_s.empty?
+  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
+  def label = @page.to_s
 
-    raise VariableError.new(self, :request_path, 'must be a bare path like "/foo"', request_path) \
-          if !request_path.start_with?('/') || request_path.include?('?')
+  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
+  def label_for(page) = page.to_s
 
-    @request_path = request_path
+  # Return the array of page numbers and :gap e.g. [1, :gap, 8, "9", 10, :gap, 36]
+  def series(size: @vars[:size], **_)
+    raise VariableError.new(self, :size, 'to be an Integer >= 0', size) \
+    unless size.is_a?(Integer) && size >= 0
+    return [] if size.zero?
+
+    [].tap do |series|
+      if size >= @last
+        series.push(*1..@last)
+      else
+        left  = ((size - 1) / 2.0).floor             # left half might be 1 page shorter for even size
+        start = if @page <= left                     # beginning pages
+                  1
+                elsif @page > (@last - size + left)  # end pages
+                  @last - size + 1
+                else                                 # intermediate pages
+                  @page - left
+                end
+        series.push(*start...start + size)
+        # Set first and last pages plus gaps when needed, respecting the size
+        if vars[:ends] && size >= 7
+          series[0]  = 1     unless series[0]  == 1
+          series[1]  = :gap  unless series[1]  == 2
+          series[-2] = :gap  unless series[-2] == @last - 1
+          series[-1] = @last unless series[-1] == @last
+        end
+      end
+      series[series.index(@page)] = @page.to_s
+    end
   end
 end
 
-require 'pagy/backend'
-require 'pagy/frontend'
-require 'pagy/exceptions'
+require_relative 'pagy/backend'
+require_relative 'pagy/frontend'
+require_relative 'pagy/exceptions'

data/{lib/locales → locales}/ar.yml

@@ -1,15 +1,14 @@
-# :arabic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :arabic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ar:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/577
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
-#        zero: ""
-#        two: ""
-#        few: ""
-#        many: ""
-#        other: ""
+      nav:
+        zero: "لا يوجد صفحات"
+        one: "صفحة"
+        two: "صفحتين"
+        few: "صفحات"
+        many: "صفحات"
+        other: "صفحات"
       prev: "السابق"
       next: "التالي"
     prev: "<"
@@ -27,4 +26,4 @@ ar:
       single_page: "عرض %{count} %{item_name}"
       multiple_pages: "عرض %{item_name} %{from}-%{to} من اجمالي %{count}"
     combo_nav_js: "الصفحة %{page_input} من %{pages}"
-    items_selector_js: "عرض %{items_input} %{item_name} لكل صفحة"
+    limit_selector_js: "عرض %{limit_input} %{item_name} لكل صفحة"

data/{lib/locales → locales}/be.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 be:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ be:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Усяго %{count} %{item_name}, паказаны з %{from} па %{to}"
     combo_nav_js: "Старонка %{page_input} з %{pages}"
-    items_selector_js: "Паказаць %{items_input} %{item_name} на старонцы"
+    limit_selector_js: "Паказаць %{limit_input} %{item_name} на старонцы"

data/{lib/locales → locales}/bg.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 bg:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ bg:
       single_page: "Показани са %{count} %{item_name}"
       multiple_pages: "Показани са %{item_name} %{from}-%{to} от %{count} общо"
     combo_nav_js: "Страница %{page_input} от %{pages}"
-    items_selector_js: "Покажи %{items_input} %{item_name} на страница"
+    limit_selector_js: "Покажи %{limit_input} %{item_name} на страница"

data/{lib/locales → locales}/bs.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 bs:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ bs:
       single_page: "Prikazuje se %{count} %{item_name}"
       multiple_pages: "Prikaz %{item_name} %{from}-%{to} od %{count} ukupno"
     combo_nav_js: "Stranica %{page_input} od %{pages}"
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    limit_selector_js: "Prikaži %{limit_input} %{item_name} po stranici"

data/{lib/locales → locales}/ca.yml

@@ -1,12 +1,10 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ca:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/581
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
-#      one: ""
-#      other: ""
+      nav:
+        one: "Pàgina"
+        other: "Pàgines"
       prev: "Anterior"
       next: "Següent"
     prev: "<"
@@ -20,4 +18,4 @@ ca:
       single_page: "Mostrant %{count} %{item_name}"
       multiple_pages: "Mostrant %{item_name} %{from}-%{to} de %{count} en total"
     combo_nav_js: "Pàgina %{page_input} de %{pages}"
-    items_selector_js: "Mostra %{items_input} %{item_name} per pàgina"
+    limit_selector_js: "Mostra %{limit_input} %{item_name} per pàgina"

data/{lib/locales → locales}/ckb.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 
 ckb:
   pagy:
@@ -15,4 +15,4 @@ ckb:
       single_page: "پیشاندانی %{count} %{item_name}"
       multiple_pages: "پشاندانی %{item_name}ی %{from}-%{to} لە کۆی %{count} بە گشتی"
     combo_nav_js: "پەڕی %{page_input} لە %{pages}"
-    items_selector_js: "نیشاندانی %{items_input} %{item_name} لە هەر پەڕێک"
+    limit_selector_js: "نیشاندانی %{limit_input} %{item_name} لە هەر پەڕێک"

data/{lib/locales → locales}/cs.yml

@@ -1,4 +1,4 @@
-# :west_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :west_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 cs:
   pagy:
     aria_label:
@@ -20,4 +20,4 @@ cs:
       single_page: "Zobrazeno %{count} %{item_name}"
       multiple_pages: "Zobrazeny položky %{from}-%{to} z %{count} celkem"
     combo_nav_js: "Strana %{page_input} z %{pages}"
-    items_selector_js: "Zobrazit %{items_input} %{item_name} na stránce"
+    limit_selector_js: "Zobrazit %{limit_input} %{item_name} na stránce"

data/{lib/locales → locales}/da.yml

@@ -1,12 +1,10 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 da:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/583
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
-#        one: ""
-#        other: ""
+      nav:
+        one: "Side"
+        other: "Sider"
       prev: "Forrige"
       next: "Næste"
     prev: "<"
@@ -20,4 +18,4 @@ da:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} af %{count} totalt"
     combo_nav_js: "Side %{page_input} af %{pages}"
-    items_selector_js: "Antal %{items_input} %{item_name} per side"
+    limit_selector_js: "Antal %{limit_input} %{item_name} per side"

data/{lib/locales → locales}/de.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 de:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ de:
       single_page: "Zeige %{count} %{item_name}"
       multiple_pages: "Zeige %{item_name} %{from}-%{to} von %{count} gesamt"
     combo_nav_js: "Seite %{page_input} von %{pages}"
-    items_selector_js: "Zeige %{items_input} %{item_name} pro Seite"
+    limit_selector_js: "Zeige %{limit_input} %{item_name} pro Seite"

data/{lib/locales → locales}/en.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 en:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ en:
       single_page: "Displaying %{count} %{item_name}"
       multiple_pages: "Displaying %{item_name} %{from}-%{to} of %{count} in total"
     combo_nav_js: "Page %{page_input} of %{pages}"
-    items_selector_js: "Show %{items_input} %{item_name} per page"
+    limit_selector_js: "Show %{limit_input} %{item_name} per page"

data/{lib/locales → locales}/es.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 es:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ es:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/{lib/locales → locales}/fr.yml

@@ -1,4 +1,4 @@
-# :one_upto_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_upto_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 fr:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ fr:
       single_page: "Affichage de %{count} %{item_name}"
       multiple_pages: "Affichage des %{item_name} %{from} à %{to} sur %{count} au total"
     combo_nav_js: "Page %{page_input} sur %{pages}"
-    items_selector_js: "Afficher %{items_input} %{item_name} par page"
+    limit_selector_js: "Afficher %{limit_input} %{item_name} par page"

data/{lib/locales → locales}/hr.yml

@@ -1,4 +1,4 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 hr:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ hr:
       single_page: "Prikazuje se %{count} %{item_name}"
       multiple_pages: "Prikaz %{item_name} %{from}-%{to} od %{count} ukupno"
     combo_nav_js: "Stranica %{page_input} od %{pages}"
-    items_selector_js: "Prikaži %{items_input} %{item_name} po stranici"
+    limit_selector_js: "Prikaži %{limit_input} %{item_name} po stranici"

data/{lib/locales → locales}/id.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 id:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ id:
       single_page: "Menampilkan %{count} %{item_name}"
       multiple_pages: "Menampilkan %{item_name} %{from}-%{to} dari total %{count}"
     combo_nav_js: "Halaman %{page_input} dari %{pages}"
-    items_selector_js: "Tampilkan %{items_input} %{item_name} per halaman"
+    limit_selector_js: "Tampilkan %{limit_input} %{item_name} per halaman"

data/{lib/locales → locales}/it.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 it:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ it:
       single_page: "Visualizzazione di %{count} %{item_name}"
       multiple_pages: "Visualizzazione %{item_name} %{from}-%{to} di %{count} in totale"
     combo_nav_js: "Pagina %{page_input} di %{pages}"
-    items_selector_js: "Mostra %{items_input} %{item_name} per pagina"
+    limit_selector_js: "Mostra %{limit_input} %{item_name} per pagina"

data/{lib/locales → locales}/ja.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ja:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ ja:
       single_page: "%{count} 件の%{item_name}"
       multiple_pages: "%{count} 件中 %{from}-%{to} 件目の%{item_name}を表示中"
     combo_nav_js: "%{page_input} / %{pages} ページ"
-    items_selector_js: "%{items_input} 件ずつ表示"
+    limit_selector_js: "%{limit_input} 件ずつ表示"

data/{lib/locales → locales}/km.yml

@@ -1,4 +1,4 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 km:
   pagy:
     aria_label:
@@ -16,4 +16,4 @@ km:
       single_page: "បង្ហាញ %{count} %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} %{from}-%{to} នៃ %{count} ជាចំនួនសរុប"
     combo_nav_js: "ទំព័រ %{page_input} នៃ %{pages}"
-    items_selector_js: "បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ"
+    limit_selector_js: "បង្ហាញ %{limit_input} %{item_name} ក្នុង ១ ទំព័រ"

data/{lib/locales → locales}/ko.yml

@@ -1,10 +1,8 @@
-# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ko:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/592
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
+      nav: "페이지"
       prev: "이전"
       next: "다음"
     prev: "<"
@@ -16,4 +14,4 @@ ko:
       single_page: "%{count}개의 %{item_name} 표시됨"
       multiple_pages: "총 %{count}개의 %{item_name} 중 %{from}-%{to}"
     combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
-    items_selector_js: "페이지 당 %{items_input}개 표시%"
+    limit_selector_js: "페이지 당 %{limit_input}개 표시%"

data/{lib/locales → locales}/nb.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 nb:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ nb:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} av totalt %{count}"
     combo_nav_js: "Side %{page_input} av %{pages}"
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    limit_selector_js: "Vis %{limit_input} %{item_name} per side"

data/{lib/locales → locales}/nl.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 nl:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ nl:
       single_page: "Toont %{count} %{item_name}"
       multiple_pages: "Toont %{from}-%{to} %{item_name} van %{count} in totaal"
     combo_nav_js: "Pagina %{page_input} van %{pages}"
-    items_selector_js: "Toont %{items_input} %{item_name} per pagina"
+    limit_selector_js: "Toont %{limit_input} %{item_name} per pagina"

data/{lib/locales → locales}/nn.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 nn:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ nn:
       single_page: "Viser %{count} %{item_name}"
       multiple_pages: "Viser %{item_name} %{from}-%{to} av totalt %{count}"
     combo_nav_js: "Side %{page_input} av %{pages}"
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    limit_selector_js: "Vis %{limit_input} %{item_name} per side"

data/{lib/locales → locales}/pl.yml

@@ -1,4 +1,4 @@
-# :polish pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :polish pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pl:
   pagy:
     aria_label:
@@ -22,4 +22,4 @@ pl:
       single_page: "Wyświetlono %{count} %{item_name}"
       multiple_pages: "Wyświetlono %{item_name} %{from}-%{to} z wszystkich %{count}"
     combo_nav_js: "Strona %{page_input} z %{pages}"
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    limit_selector_js: "Pokaż %{limit_input} %{item_name} na stronie"

data/{lib/locales → locales}/pt-BR.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pt-BR:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ pt-BR:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/{lib/locales → locales}/pt.yml

@@ -1,4 +1,4 @@
-# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 pt:
   pagy:
     aria_label:
@@ -18,4 +18,4 @@ pt:
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
     combo_nav_js: "Página %{page_input} de %{pages}"
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    limit_selector_js: "Mostrar %{limit_input} %{item_name} por página"

data/{lib/locales → locales}/ru.yml

@@ -1,14 +1,12 @@
-# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
 ru:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/599
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
-#        one: ""
-#        few: ""
-#        many: ""
-#        other: ""
+      nav:
+        one: "Страница"
+        few: "Страницы"
+        many: "Страниц"
+        other: "Страниц"
       prev: "Назад"
       next: "Вперёд"
     prev: "<"
@@ -24,4 +22,4 @@ ru:
       single_page: "%{count} %{item_name}"
       multiple_pages: "Всего %{count} %{item_name}, показаны с %{from} по %{to}"
     combo_nav_js: "Страница %{page_input} из %{pages}"
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    limit_selector_js: "Показать %{limit_input} %{item_name} на странице"