pagy 8.6.3 → 9.0.0

data/lib/pagy/extras/standalone.rb

@@ -12,10 +12,6 @@ class Pagy # :nodoc:
     module QueryUtils
       module_function
 
-      def escape(str)
-        URI.encode_www_form_component(str)
-      end
-
       def build_nested_query(value, prefix = nil)
         case value
         when Array
@@ -32,13 +28,17 @@ class Pagy # :nodoc:
           "#{escape(prefix)}=#{escape(value)}"
         end
       end
+
+      def escape(str)
+        URI.encode_www_form_component(str)
+      end
     end
     # :nocov:
 
     # Return the URL for the page. If there is no pagy.vars[:url]
     # it works exactly as the regular #pagy_url_for, relying on the params method and Rack.
     # If there is a defined pagy.vars[:url] variable it does not need the params method nor Rack.
-    def pagy_url_for(pagy, page, absolute: false, **_)
+    def pagy_url_for(pagy, page, fragment: nil, **_)
       return super unless pagy.vars[:url]
 
       vars         = pagy.vars
@@ -46,7 +46,7 @@ class Pagy # :nodoc:
       pagy_set_query_params(page, vars, params)
       params       = vars[:params].(params) if vars[:params].is_a?(Proc)
       query_string = "?#{QueryUtils.build_nested_query(params)}"
-      "#{vars[:url]}#{query_string}#{vars[:fragment]}"
+      "#{vars[:url]}#{query_string}#{fragment}"
     end
   end
   UrlHelpers.prepend StandaloneExtra

data/lib/pagy/extras/trim.rb

@@ -6,9 +6,9 @@ class Pagy # :nodoc:
 
   # Remove the page=1 param from the first page link
   module TrimExtra
-    # Override the original pagy_a_proc.
+    # Override the original pagy_anchor.
     # Call the pagy_trim method for page 1 if the trim_extra is enabled
-    def pagy_anchor(pagy)
+    def pagy_anchor(pagy, **_)
       a_proc = super
       return a_proc unless pagy.vars[:trim_extra]
 

data/lib/pagy/frontend.rb

@@ -1,8 +1,8 @@
 # See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/docs/api/frontend
 # frozen_string_literal: true
 
-require_relative 'url_helpers'
 require_relative 'i18n'
+require_relative 'url_helpers'
 
 class Pagy
   # Used for search and replace, hardcoded also in the pagy.js file
@@ -14,26 +14,17 @@ class Pagy
   module Frontend
     include UrlHelpers
 
-    # Generic pagination: it returns the html with the series of links to the pages
-    def pagy_nav(pagy, id: nil, aria_label: nil, **vars)
-      id = %( id="#{id}") if id
-      a  = pagy_anchor(pagy)
-
-      html = %(<nav#{id} class="pagy nav" #{nav_aria_label(pagy, aria_label:)}>#{
-                 prev_a(pagy, a)})
-      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << case item
-                when Integer
-                  a.(item)
-                when String
-                  %(<a role="link" aria-disabled="true" aria-current="page" class="current">#{pagy.label_for(item)}</a>)
-                when :gap
-                  %(<a role="link" aria-disabled="true" class="gap">#{pagy_t('pagy.gap')}</a>)
-                else
-                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
-                end
+    # Return a performance optimized lambda to generate the HTML anchor element (a tag)
+    # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
+    def pagy_anchor(pagy, anchor_string: nil, **vars)
+      anchor_string &&= %( #{anchor_string})
+      left, right = %(<a#{anchor_string} href="#{pagy_url_for(pagy, PAGE_TOKEN, **vars)}").split(PAGE_TOKEN, 2)
+      # lambda used by all the helpers
+      lambda do |page, text = pagy.label_for(page), classes: nil, aria_label: nil|
+        classes    = %( class="#{classes}") if classes
+        aria_label = %( aria-label="#{aria_label}") if aria_label
+        %(#{left}#{page}#{right}#{classes}#{aria_label}>#{text}</a>)
       end
-      html << %(#{next_a(pagy, a)}</nav>)
     end
 
     # Return examples: "Displaying items 41-60 of 324 in total" or "Displaying Products 41-60 of 324 in total"
@@ -54,24 +45,32 @@ class Pagy
         }</span>)
     end
 
-    # Return a performance optimized lambda to generate the HTML anchor element (a tag)
-    # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
-    def pagy_anchor(pagy)
-      a_string    = pagy.vars[:anchor_string]
-      a_string    = %( #{a_string}) if a_string
-      left, right = %(<a#{a_string} href="#{pagy_url_for(pagy, PAGE_TOKEN)}").split(PAGE_TOKEN, 2)
-      # lambda used by all the helpers
-      lambda do |page, text = pagy.label_for(page), classes: nil, aria_label: nil|
-        classes    = %( class="#{classes}") if classes
-        aria_label = %( aria-label="#{aria_label}") if aria_label
-        %(#{left}#{page}#{right}#{classes}#{aria_label}>#{text}</a>)
+    # Generic pagination: it returns the html with the series of links to the pages
+    def pagy_nav(pagy, id: nil, aria_label: nil, anchor_string: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy, anchor_string:)
+
+      html = %(<nav#{id} class="pagy nav" #{nav_aria_label(pagy, aria_label:)}>#{
+                 prev_a(pagy, a)})
+      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer
+                  a.(item)
+                when String
+                  %(<a role="link" aria-disabled="true" aria-current="page" class="current">#{pagy.label_for(item)}</a>)
+                when :gap
+                  %(<a role="link" aria-disabled="true" class="gap">#{pagy_t('pagy.gap')}</a>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                end
       end
+      html << %(#{next_a(pagy, a)}</nav>)
     end
 
     # Similar to I18n.t: just ~18x faster using ~10x less memory
     # (@pagy_locale explicitly initialized in order to avoid warning)
-    def pagy_t(key, opts = {})
-      Pagy::I18n.translate(@pagy_locale ||= nil, key, opts)
+    def pagy_t(key, **opts)
+      Pagy::I18n.translate(@pagy_locale ||= nil, key, **opts)
     end
 
     private

data/lib/pagy/i18n.rb

@@ -154,7 +154,7 @@ class Pagy
     end
 
     # Translate and pluralize the key with the locale DATA
-    def translate(locale, key, opts = {})
+    def translate(locale, key, **opts)
       data, pluralize = DATA[locale]
       translation = data[key] || (opts[:count] && data[key += ".#{pluralize.call(opts[:count])}"]) \
                       or return %([translation missing: "#{key}"])

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 of the record
+      def latest_from(latest_record) = latest_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 out the already retrieved records
+      def after_latest = @set.where(after_latest_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 of the latest record
+      def latest_from(latest_record) = latest_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 out the already retrieved records
+      def after_latest = @set.where(::Sequel.lit(after_latest_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,99 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+require 'json'
+require_relative 'b64'
+
+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 = @vars[:typecast_latest]&.(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 ||= B64.urlsafe_encode(latest_from(@records.last).to_json)
+    end
+
+    # Retrieve the array of records for the current page
+    def records
+      @records ||= begin
+        @set    = apply_select if select?
+        @set    = @vars[:after_latest]&.(@set, @latest) || after_latest if @latest
+        records = @set.limit(@limit + 1).to_a
+        @more   = records.size > @limit && !records.pop.nil?
+        records
+      end
+    end
+
+    protected
+
+    # Prepare the literal query to filter out the already retrieved records
+    def after_latest_query
+      operator   = { asc: '>', desc: '<' }
+      directions = @keyset.values
+      if @vars[:row_comparison]
+        # Row comparison: check if your DB supports it (especially if you have mixed order rows)
+        columns      = @keyset.keys
+        placeholders = columns.map { |column| ":#{column}" }.join(', ')
+        "( #{columns.join(', ')} ) #{operator[directions.first]} ( #{placeholders} )"
+      else
+        # Generic comparison: works for keysets ordered in mixed or same directions
+        keyset = @keyset.to_a
+        where  = []
+        until keyset.empty?
+          last_column, last_direction = keyset.pop
+          query = +'( '
+          query << (keyset.map { |column, _d| "#{column} = :#{column}" } \
+                    << "#{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/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.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[:page_param].to_s]  = page if page
+      query_params[vars[:limit_param].to_s] = vars[:limit] if vars[:limit_extra]
     end
   end
 end

data/lib/pagy.rb

@@ -3,47 +3,98 @@
 
 require 'pathname'
 
-# Core class
+# Top superclass: it should define only what's common to all the subclasses
 class Pagy
-  VERSION = '8.6.3'
+  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__).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 }
+  # Shared with Keyset
+  module SharedMethods
+    attr_reader :page, :limit, :vars
 
-  attr_reader :count, :page, :items, :vars, :last, :offset, :in, :from, :to, :prev, :next
+    # 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
+  include SharedMethods
+
+  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|
@@ -70,51 +121,8 @@ class Pagy
       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/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"