pagy 8.6.3 → 9.3.4

data/lib/pagy/keyset/active_record.rb

@@ -0,0 +1,38 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+class Pagy
+  class Keyset
+    # Keyset adapter for ActiveRecord
+    class ActiveRecord < Keyset
+      protected
+
+      # Get the keyset attributes from the record
+      def keyset_attributes_from(record) = record.slice(*@keyset.keys)
+
+      # Extract the keyset from the set
+      def extract_keyset
+        @set.order_values.each_with_object({}) do |node, keyset|
+          keyset[node.value.name.to_sym] = node.direction
+        end
+      end
+
+      # Filter the newest records
+      def filter_newest = @set.where(filter_newest_query, **@latest)
+
+      # Append the missing keyset keys if the set is restricted by select
+      def apply_select
+        @set.select(*@keyset.keys)
+      end
+
+      # Set with selected columns?
+      def select? = !@set.select_values.empty?
+
+      # Typecast the latest attributes
+      def typecast_latest(latest)
+        @set.model.new(latest).slice(latest.keys)
+            .to_hash.transform_keys(&:to_sym)
+      end
+    end
+  end
+end

data/lib/pagy/keyset/sequel.rb

@@ -0,0 +1,51 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+class Pagy
+  class Keyset
+    # Keyset adapter for sequel
+    class Sequel < Keyset
+      protected
+
+      # Get the keyset attributes from the record
+      def keyset_attributes_from(record) = record.to_hash.slice(*@keyset.keys)
+
+      # Extract the keyset from the set
+      def extract_keyset
+        return {} unless @set.opts[:order]
+
+        @set.opts[:order].each_with_object({}) do |item, keyset|
+          case item
+          when Symbol
+            keyset[item] = :asc
+          when ::Sequel::SQL::OrderedExpression
+            keyset[item.expression] = item.descending ? :desc : :asc
+          else
+            raise TypeError, "#{item.class.inspect} is not a supported Sequel::SQL::OrderedExpression"
+          end
+        end
+      end
+
+      # Filter the newest records
+      def filter_newest = @set.where(::Sequel.lit(filter_newest_query, **@latest))
+
+      # Append the missing keyset keys if the set is restricted by select
+      def apply_select
+        selected = @set.opts[:select]
+        @set.select_append(*@keyset.keys.reject { |c| selected.include?(c) })
+      end
+
+      # Set with selected columns?
+      def select? = !@set.opts[:select].nil?
+
+      # Typecast the latest attributes
+      def typecast_latest(latest)
+        model = @set.opts[:model]
+        model.unrestrict_primary_key if (restricted_pk = model.restrict_primary_key?)
+        latest = model.new(latest).to_hash.slice(*latest.keys.map(&:to_sym))
+        model.restrict_primary_key if restricted_pk
+        latest
+      end
+    end
+  end
+end

data/lib/pagy/keyset.rb

@@ -0,0 +1,118 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+require 'json'
+require_relative 'b64'
+require_relative 'shared_methods'
+
+class Pagy
+  # Implement wicked-fast keyset pagination for big data
+  class Keyset
+    class TypeError < ::TypeError; end
+
+    include SharedMethods
+
+    # Pick the right adapter for the set
+    def self.new(set, **vars)
+      if self == Pagy::Keyset
+        if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
+          ActiveRecord
+        elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
+          Sequel
+        else
+          raise TypeError, "expected set to be an instance of ActiveRecord::Relation or Sequel::Dataset; got #{set.class}"
+        end.new(set, **vars)
+      else
+        allocate.tap { |instance| instance.send(:initialize, set, **vars) }
+      end
+    end
+
+    attr_reader :latest  # Other readers from SharedMethods
+
+    def initialize(set, **vars)
+      default = DEFAULT.slice(:limit, :page_param,                    # from pagy
+                              :headers,                               # from headers extra
+                              :jsonapi,                               # from jsonapi extra
+                              :limit_param, :limit_max, :limit_extra) # from limit_extra
+      assign_vars({ **default, page: nil }, vars)
+      assign_limit
+      @set    = set
+      @page   = @vars[:page]
+      @keyset = extract_keyset
+      raise InternalError, 'the set must be ordered' if @keyset.empty?
+      return unless @page
+
+      latest  = JSON.parse(B64.urlsafe_decode(@page)).transform_keys(&:to_sym)
+      @latest = typecast_latest(latest)
+      raise InternalError, 'page and keyset are not consistent' \
+            unless @latest.keys == @keyset.keys
+    end
+
+    # Return the next page
+    def next
+      records
+      return unless @more
+
+      @next ||= begin
+                  hash = keyset_attributes_from(@records.last)
+                  json = @vars[:jsonify_keyset_attributes]&.(hash) || hash.to_json
+                  B64.urlsafe_encode(json)
+                end
+    end
+
+    # Fetch the array of records for the current page
+    def records
+      @records ||= begin
+                     @set = apply_select if select?
+                     if @latest
+                       # :nocov:
+                       @set = @vars[:after_latest]&.(@set, @latest) || # deprecated
+                              # :nocov:
+                              @vars[:filter_newest]&.(@set, @latest, @keyset) ||
+                              filter_newest
+                     end
+                     records = @set.limit(@limit + 1).to_a
+                     @more   = records.size > @limit && !records.pop.nil?
+                     records
+                   end
+    end
+
+    protected
+
+    # Prepare the literal query string (complete with the placeholders for value interpolation)
+    # used to filter the newest records.
+    # For example:
+    # With a set like Pet.order(animal: :asc, name: :desc, id: :asc) it returns the following string:
+    # ( "pets"."animal" = :animal AND "pets"."name" = :name AND "pets"."id" > :id ) OR
+    # ( "pets"."animal" = :animal AND "pets"."name" < :name ) OR
+    # ( "pets"."animal" > :animal )
+    # When :tuple_comparison is enabled, and if the order is all :asc or all :desc,
+    # with a set like Pet.order(:animal, :name, :id) it returns the following string:
+    # ( "pets"."animal", "pets"."name", "pets"."id" ) > ( :animal, :name, :id )
+    def filter_newest_query
+      operator   = { asc: '>', desc: '<' }
+      directions = @keyset.values
+      table      = @set.model.table_name
+      name       = @keyset.to_h { |column| [column, %("#{table}"."#{column}")] }
+      if @vars[:tuple_comparison] && (directions.all?(:asc) || directions.all?(:desc))
+        placeholders = @keyset.keys.map { |column| ":#{column}" }.join(', ')
+        "( #{name.values.join(', ')} ) #{operator[directions.first]} ( #{placeholders} )"
+      else
+        keyset = @keyset.to_a
+        where  = []
+        until keyset.empty?
+          last_column, last_direction = keyset.pop
+          query = +'( '
+          query << (keyset.map { |column, _d| "#{name[column]} = :#{column}" } \
+                    << "#{name[last_column]} #{operator[last_direction]} :#{last_column}").join(' AND ')
+          query << ' )'
+          where << query
+        end
+        where.join(' OR ')
+      end
+    end
+  end
+end
+
+require_relative 'keyset/active_record'
+require_relative 'keyset/sequel'

data/lib/pagy/shared_methods.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Pagy
+  # Shared with Keyset
+  module SharedMethods
+    attr_reader :page, :limit, :vars
+
+    # 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
+    end
+
+    # Assign @limit (overridden by the gearbox extra)
+    def assign_limit
+      assign_and_check(limit: 1)
+    end
+
+    # Assign @vars
+    def assign_vars(default, vars)
+      @vars = { **default, **vars.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') } }
+    end
+  end
+end

data/lib/pagy/url_helpers.rb

@@ -6,21 +6,21 @@ class Pagy
     # Return the URL for the page, relying on the params method and Rack by default.
     # It supports all Rack-based frameworks (Sinatra, Padrino, Rails, ...).
     # For non-rack environments you can use the standalone extra
-    def pagy_url_for(pagy, page, absolute: false, **_)
+    def pagy_url_for(pagy, page, absolute: false, fragment: nil, **_)
       vars         = pagy.vars
-      query_params = request.GET.clone
+      query_params = request.GET.clone(freeze: false)
       query_params.merge!(vars[:params].transform_keys(&:to_s)) if vars[:params].is_a?(Hash)
       pagy_set_query_params(page, vars, query_params)
       query_params = vars[:params].(query_params) if vars[:params].is_a?(Proc)
       query_string = "?#{Rack::Utils.build_nested_query(query_params)}"
-      "#{request.base_url if absolute}#{vars[:request_path] || request.path}#{query_string}#{vars[:fragment]}"
+      "#{request.base_url if absolute}#{vars[:request_path] || request.path}#{query_string}#{fragment}"
     end
 
-    # Add the page and items params
+    # Add the page and limit params
     # Overridable by the jsonapi extra
     def pagy_set_query_params(page, vars, query_params)
       query_params[vars[:page_param].to_s]  = page
-      query_params[vars[:items_param].to_s] = vars[:items] if vars[:items_extra]
+      query_params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra]
     end
   end
 end

data/lib/pagy.rb

@@ -2,48 +2,77 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require_relative 'pagy/shared_methods'
 
-# Core class
+# Top superclass: it should define only what's common to all the subclasses
 class Pagy
-  VERSION = '8.6.3'
+  VERSION = '9.3.4'
+
+  # 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__).parent.freeze
   end
 
-  # Core default: constant for easy access, but mutable for customizable defaults
-  DEFAULT = { page:       1, # rubocop:disable Style/MutableConstant
-              items:      20,
-              outset:     0,
-              size:       7,
-              ends:       true,
-              count_args: [:all],  # AR friendly
-              page_param: :page }
+  include SharedMethods
 
-  attr_reader :count, :page, :items, :vars, :last, :offset, :in, :from, :to, :prev, :next
+  attr_reader :count, :from, :in, :last, :next, :offset, :prev, :to
   alias pages last
 
   # 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_offset_var
-    setup_last_var
-    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
-
+  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 + @items, @count].min
+    @to   = [@offset - @outset + @limit, @count].min
     @in   = [@to - @from + 1, @count].min
+    assign_prev_and_next
+  end
+
+  # 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
+
+  # Assign @offset (overridden by the gearbox extra)
+  def assign_offset
+    @offset = (@limit * (@page - 1)) + @outset  # may be already set from gear_box
+  end
+
+  # 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
 
-  # Return the array of page numbers and :gap items e.g. [1, :gap, 8, "9", 10, :gap, 36]
+  # Checks the @page <= @last
+  def check_overflow
+    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+  end
+
+  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
+  def label = @page.to_s
+
+  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
+  def label_for(page) = page.to_s
+
+  # 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
+    unless size.is_a?(Integer) && size >= 0
     return [] if size.zero?
 
     [].tap do |series|
@@ -61,60 +90,17 @@ class Pagy
         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[0]  = 1
           series[1]  = :gap  unless series[1]  == 2
           series[-2] = :gap  unless series[-2] == @last - 1
-          series[-1] = @last unless series[-1] == @last
+          series[-1] = @last
         end
       end
       series[series.index(@page)] = @page.to_s
     end
   end
-
-  # Label for any page. Allow the customization of the output (overridden by the calendar extra)
-  def label_for(page)
-    page.to_s
-  end
-
-  # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
-  def label
-    @page.to_s
-  end
-
-  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
-
-  # 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
-  end
-
-  # Setup @items (overridden by the gearbox extra)
-  def setup_items_var
-    setup_vars(items: 1)
-  end
-
-  # Setup @offset (overridden by the gearbox extra)
-  def setup_offset_var
-    @offset = (@items * (@page - 1)) + @outset  # may be already set from gear_box
-  end
-
-  # Setup @last (overridden by the gearbox extra)
-  def setup_last_var
-    @last = [(@count.to_f / @items).ceil, 1].max
-    @last = vars[:max_pages] if vars[:max_pages] && @last > vars[:max_pages]
-  end
-  alias setup_pages_var setup_last_var
 end
 
-require_relative 'pagy/extras/size' # will be opt in in v9.0
 require_relative 'pagy/backend'
 require_relative 'pagy/frontend'
 require_relative 'pagy/exceptions'

data/locales/ar.yml

@@ -26,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/locales/be.yml

@@ -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/locales/bg.yml

@@ -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/locales/bs.yml

@@ -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/locales/ca.yml

@@ -18,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/locales/ckb.yml

@@ -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/locales/cs.yml

@@ -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/locales/da.yml

@@ -18,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/locales/de.yml

@@ -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/locales/dz.yml

@@ -0,0 +1,17 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/gem/lib/pagy/i18n.rb)
+dz:
+  pagy:
+    aria_label:
+      nav: "ཤོག་ལེབ་"
+      prev: "སྔོན་མ་"
+      next: "ཤུལ༌མ་"
+    prev: "<"
+    next: ">"
+    gap: "…"
+    item_name: "རྣམ་གྲངས་"
+    info:
+      no_items: "%{item_name}གཅིག་ཡང་འཚོལ་མ་འཐོབ།"
+      single_page: "%{item_name} %{count} བཀྲམ་སྟོན་འབད་དོ།"
+      multiple_pages: "བསྡོམས་ཀྱིས་ %{count} ལས་%{item_name} %{from}-%{to} བཀྲམ་སྟོན་འབད་དོ།"
+    combo_nav_js: "ཤོག་ལེབ་ %{pages} ལས་ %{page_input}།"
+    limit_selector_js: "ཤོག་ལེབ་རེ་ལུ་%{item_name} %{limit_input} སྟོན།"

data/locales/en.yml

@@ -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/locales/es.yml

@@ -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/locales/fr.yml

@@ -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/locales/hr.yml

@@ -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/locales/id.yml

@@ -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/locales/it.yml

@@ -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/locales/ja.yml

@@ -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/locales/km.yml

@@ -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/locales/ko.yml

@@ -14,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/locales/nb.yml

@@ -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/locales/nl.yml

@@ -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/locales/nn.yml

@@ -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/locales/pl.yml

@@ -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/locales/pt-BR.yml

@@ -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/locales/pt.yml

@@ -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/locales/ru.yml

@@ -22,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} на странице"

data/locales/sr.yml

@@ -22,4 +22,4 @@ sr:
       single_page: "Приказује се %{count} %{item_name}"
       multiple_pages: "Приказ %{item_name} %{from}-%{to} од %{count} укупно"
     combo_nav_js: "Страниca %{page_input} од %{pages}"
-    items_selector_js: "Прикажи %{items_input} %{item_name} по страниcи"
+    limit_selector_js: "Прикажи %{limit_input} %{item_name} по страниcи"

data/locales/sv-SE.yml

@@ -18,4 +18,4 @@ sv-SE:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"

data/locales/sv.yml

@@ -18,4 +18,4 @@ sv:
       single_page: "Visar %{count} %{item_name}"
       multiple_pages: "Visar %{item_name} %{from}-%{to} av %{count} totalt"
     combo_nav_js: "Sida %{page_input} av %{pages}"
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    limit_selector_js: "Visa %{limit_input} %{item_name} per sida"