pagy 7.0.11 → 8.0.1

data/gem/lib/pagy/extras/uikit.rb

@@ -0,0 +1,96 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/uikit
+# frozen_string_literal: true
+
+require 'pagy/extras/js_tools'
+
+class Pagy # :nodoc:
+  # Frontend modules are specially optimized for performance.
+  # The resulting code may not look very elegant, but produces the best benchmarks
+  module UikitExtra
+    # Pagination for uikit: it returns the html with the series of links to the pages
+    def pagy_uikit_nav(pagy, id: nil, aria_label: nil, **vars)
+      id = %( id="#{id}") if id
+      a  = pagy_anchor(pagy)
+
+      html = %(<ul#{id} class="pagy-uikit nav uk-pagination uk-flex-center" role="navigation" #{
+                nav_aria_label(pagy, aria_label:)}>#{
+                uikit_prev_html(pagy, a)})
+      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+        html << case item
+                when Integer
+                  %(<li>#{a.(item)}</li>)
+                when String
+                  %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                      pagy.label_for(item)}</span></li>)
+                when :gap
+                  %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>)
+                else
+                  raise InternalError, "expected item types in series to be Integer, String or :gap; got #{item.inspect}"
+                end
+      end
+      html << %(#{uikit_next_html(pagy, a)}</ul>)
+    end
+
+    # Javascript pagination for uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_nav_js(pagy, id: nil, aria_label: nil, **vars)
+      sequels = pagy.sequels(**vars)
+      id      = %( id="#{id}") if id
+      a       = pagy_anchor(pagy)
+      tokens  = { 'before'  => uikit_prev_html(pagy, a),
+                  'a'       => %(<li>#{a.(PAGE_TOKEN, LABEL_TOKEN)}</li>),
+                  'current' => %(<li class="uk-active"><span role="link" aria-current="page" aria-disabled="true">#{
+                                   LABEL_TOKEN}</span></li>),
+                  'gap'     => %(<li class="uk-disabled"><span>#{pagy_t 'pagy.gap'}</span></li>),
+                  'after'   => uikit_next_html(pagy, a) }
+
+      %(<ul#{id} class="#{'pagy-rjs ' if sequels.size > 1}pagy-uikit nav-js uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :nav, tokens, sequels, pagy.label_sequels(sequels))
+        }></ul>)
+    end
+
+    # Javascript combo pagination for uikit: it returns a nav with a data-pagy attribute used by the pagy.js file
+    def pagy_uikit_combo_nav_js(pagy, id: nil, aria_label: nil)
+      id    = %( id="#{id}") if id
+      a     = pagy_anchor(pagy)
+      pages = pagy.pages
+
+      page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
+                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem;">)
+
+      %(<ul#{id} class="pagy-uikit combo-nav-js uk-button-group uk-pagination uk-flex-center" role="navigation" #{
+          nav_aria_label(pagy, aria_label:)} #{
+          pagy_data(pagy, :combo, pagy_url_for(pagy, PAGE_TOKEN))
+        }>#{
+          uikit_prev_html(pagy, a)
+        }<li><label>#{
+          pagy_t('pagy.combo_nav_js', page_input:, pages:)
+        }</label></li>#{
+          uikit_next_html(pagy, a)
+        }</ul>)
+    end
+
+    private
+
+    def uikit_prev_html(pagy, a)
+      span = %(<span uk-pagination-previous></span>)
+      if (p_prev = pagy.prev)
+        %(<li>#{a.(p_prev, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
+      else
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.prev')}">#{span}</a></li>)
+      end
+    end
+
+    def uikit_next_html(pagy, a)
+      span = %(<span uk-pagination-next></span>)
+      if (p_next = pagy.next)
+        %(<li>#{a.(p_next, span, aria_label: pagy_t('pagy.aria_label.prev'))}</li>)
+      else
+        %(<li class="uk-disabled"><a role="link" aria-disabled="true" aria-label="#{
+            pagy_t('pagy.aria_label.next')}">#{span}</a></li>)
+      end
+    end
+  end
+  Frontend.include UikitExtra
+end

data/gem/lib/pagy/frontend.rb

@@ -0,0 +1,97 @@
+# See Pagy::Frontend API documentation: https://ddnexus.github.io/pagy/docs/api/frontend
+# frozen_string_literal: true
+
+require 'pagy/url_helpers'
+require 'pagy/i18n'
+
+class Pagy
+  # Used for search and replace, hardcoded also in the pagy.js file
+  PAGE_TOKEN  = '__pagy_page__'
+  LABEL_TOKEN = '__pagy_label__'
+
+  # Frontend modules are specially optimized for performance.
+  # The resulting code may not look very elegant, but produces the best benchmarks
+  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
+      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"
+    def pagy_info(pagy, id: nil, item_name: nil)
+      id      = %( id="#{id}") if id
+      p_count = pagy.count
+      key     = if    p_count.zero?   then 'pagy.info.no_items'
+                elsif pagy.pages == 1 then 'pagy.info.single_page'
+                else                       'pagy.info.multiple_pages' # rubocop:disable Lint/ElseLayout
+                end
+
+      %(<span#{id} class="pagy info">#{
+          pagy_t key, item_name: item_name || pagy_t('pagy.item_name', count: p_count),
+                      count: p_count, from: pagy.from, to: pagy.to
+        }</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>)
+      end
+    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)
+    end
+
+    private
+
+    def nav_aria_label(pagy, aria_label: nil)
+      aria_label ||= pagy_t('pagy.aria_label.nav', count: pagy.pages)
+      %(aria-label="#{aria_label}")
+    end
+
+    def prev_a(pagy, a, text: pagy_t('pagy.prev'), aria_label: pagy_t('pagy.aria_label.prev'))
+      if (p_prev = pagy.prev)
+        a.(p_prev, text, aria_label:)
+      else
+        %(<a role="link" aria-disabled="true" aria-label="#{aria_label}">#{text}</a>)
+      end
+    end
+
+    def next_a(pagy, a, text: pagy_t('pagy.next'), aria_label: pagy_t('pagy.aria_label.next'))
+      if (p_next = pagy.next)
+        a.(p_next, text, aria_label:)
+      else
+        %(<a role="link" aria-disabled="true" aria-label=#{aria_label}>#{text}</a>)
+      end
+    end
+  end
+end

data/{lib → gem/lib}/pagy/url_helpers.rb

@@ -8,13 +8,12 @@ class Pagy
     # For non-rack environments you can use the standalone extra
     def pagy_url_for(pagy, page, absolute: false, **_)
       vars         = pagy.vars
-      request_path = vars[:request_path].to_s.empty? ? request.path : vars[:request_path]
       pagy_params  = pagy.params.is_a?(Hash) ? pagy.params.transform_keys(&:to_s) : {}
       params       = request.GET.merge(pagy_params)
       pagy_set_query_params(page, vars, params)
       params       = pagy.params.call(params) if pagy.params.is_a?(Proc)
       query_string = "?#{Rack::Utils.build_nested_query(params)}"
-      "#{request.base_url if absolute}#{request_path}#{query_string}#{vars[:fragment]}"
+      "#{request.base_url if absolute}#{vars[:request_path] || request.path}#{query_string}#{vars[:fragment]}"
     end
 
     # Add the page and items params

data/{lib → gem/lib}/pagy.rb

@@ -5,27 +5,28 @@ require 'pathname'
 
 # Core class
 class Pagy
-  VERSION = '7.0.11'
+  VERSION = '8.0.1'
 
-  # Root pathname to get the path of Pagy files like templates or dictionaries
+  # 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
 
-  # Default core vars: constant for easy access, but mutable for customizable defaults
+  # Core defult: constant for easy access, but mutable for customizable defaults
   DEFAULT = { page:          1, # rubocop:disable Style/MutableConstant
               items:         20,
               outset:        0,
               size:          7,
-              page_param:    :page,
+              cycle:         false,
+              # backend/collection
+              count_args:    [:all],  # AR friendly
+              # backend/url
               params:        {},
+              page_param:    :page,
               fragment:      '',
-              link_extra:    '',
-              item_i18n_key: 'pagy.item_name',
-              nav_i18n_key: 'pagy.aria_label.nav',
-              cycle:         false,
-              request_path:  '',
-              count_args:    [:all] } # AR friendly
+              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
 

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

@@ -24,7 +24,7 @@ ar:
       other: "عناصر"
     info:
       no_items: "لا يوجد %{item_name}"
-      single_page: "عرض <b>%{count}</b> %{item_name}"
-      multiple_pages: "عرض %{item_name} <b>%{from}-%{to}</b> من اجمالي <b>%{count}</b>"
+      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} لكل صفحة"

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

@@ -19,7 +19,7 @@ be:
       other: "запісаў"
     info:
       no_items: "Пакуль %{item_name} няма"
-      single_page: "<b>%{count}</b> %{item_name}"
-      multiple_pages: "Усяго <b>%{count}</b> %{item_name}, паказаны з <b>%{from}</b> па <b>%{to}</b>"
-    combo_nav_js: "<label>Старонка %{page_input} з %{pages}</label>"
-    items_selector_js: "<label>Паказаць %{items_input} %{item_name} на старонцы</label>"
+      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} на старонцы"

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

@@ -15,7 +15,7 @@ bg:
       other: "резултати"
     info:
       no_items: "Няма намерени %{item_name}"
-      single_page: "Показани са <b>%{count}</b> %{item_name}"
-      multiple_pages: "Показани са %{item_name} <b>%{from}-%{to}</b> от <b>%{count}</b> общо"
-    combo_nav_js: "<label>Страница %{page_input} от %{pages}</label>"
-    items_selector_js: "<label>Покажи %{items_input} %{item_name} на страница</label>"
+      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} на страница"

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

@@ -19,7 +19,7 @@ bs:
       other: "stavki"
     info:
       no_items: "Nije pronađena %{item_name}"
-      single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
-      multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
-    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
-    items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"
+      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"

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

@@ -17,7 +17,7 @@ ca:
       other: "elements"
     info:
       no_items: "No s'ha trobat cap resultat"
-      single_page: "Mostrant <b>%{count}</b> %{item_name}"
-      multiple_pages: "Mostrant %{item_name} <b>%{from}-%{to}</b> de <b>%{count}</b> en total"
-    combo_nav_js: "<label>Pàgina %{page_input} de %{pages}</label>"
-    items_selector_js: "<label>Mostra %{items_input} %{item_name} per pàgina</label>"
+      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"

data/gem/locales/ckb.yml

@@ -0,0 +1,18 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/pagy/i18n.rb)
+
+ckb:
+  pagy:
+    item_name: "بابەت"
+    aria_label:
+      nav: "پەڕەکان"
+      prev: "پاش"
+      next: "پێش"
+    prev: "<"
+    next: ">"
+    gap: "…"
+    info:
+      no_items: "هیچ %{item_name}ێک نەدۆزرایەوە"
+      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} لە هەر پەڕێک"

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

@@ -17,7 +17,7 @@ cs:
       other: "položek"
     info:
       no_items: "Nic nebylo nalezeno"
-      single_page: "Zobrazeno <b>%{count}</b> %{item_name}"
-      multiple_pages: "Zobrazeny položky <b>%{from}-%{to}</b> z <b>%{count}</b> celkem"
-    combo_nav_js: "<label>Strana %{page_input} z %{pages}</label>"
-    items_selector_js: "<label>Zobrazit %{items_input} %{item_name} na stránce</label>"
+      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"

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

@@ -17,7 +17,7 @@ da:
       other: "resultater"
     info:
       no_items: "Ingen %{item_name} fundet"
-      single_page: "Viser <b>%{count}</b> %{item_name}"
-      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> af <b>%{count}</b> totalt"
-    combo_nav_js: "<label>Side %{page_input} af %{pages}</label>"
-    items_selector_js: "<label>Antal %{items_input} %{item_name} per side</label>"
+      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"

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

@@ -15,7 +15,7 @@ de:
       other: "Einträge"
     info:
       no_items: "Keine %{item_name} gefunden"
-      single_page: "Zeige <b>%{count}</b> %{item_name}"
-      multiple_pages: "Zeige %{item_name} <b>%{from}-%{to}</b> von <b>%{count}</b> gesamt"
-    combo_nav_js: "<label>Seite %{page_input} von %{pages}</label>"
-    items_selector_js: "<label>Zeige %{items_input} %{item_name} pro Seite</label>"
+      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"

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

@@ -15,7 +15,7 @@ en:
       other: "items"
     info:
       no_items: "No %{item_name} found"
-      single_page: "Displaying <b>%{count}</b> %{item_name}"
-      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
-    combo_nav_js: "<label>Page %{page_input} of %{pages}</label>"
-    items_selector_js: "<label>Show %{items_input} %{item_name} per page</label>"
+      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"

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

@@ -17,5 +17,5 @@ es:
       no_items: "Sin resultados"
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
-    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
-    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"
+    combo_nav_js: "Página %{page_input} de %{pages}"
+    items_selector_js: "Mostrar %{items_input} %{item_name} por página"

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

@@ -15,7 +15,7 @@ fr:
       other: "éléments"
     info:
       no_items: "Aucun %{item_name} trouvé"
-      single_page: "Affichage de <b>%{count}</b> %{item_name}"
-      multiple_pages: "Affichage des %{item_name} <b>%{from} à %{to}</b> sur <b>%{count}</b> au total"
-    combo_nav_js: "<label>Page %{page_input} sur %{pages}</label>"
-    items_selector_js: "<label>Afficher %{items_input} %{item_name} par page</label>"
+      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"

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

@@ -19,7 +19,7 @@ hr:
       other: "stavki"
     info:
       no_items: "Nije pronađena %{item_name}"
-      single_page: "Prikazuje se <b>%{count}</b> %{item_name}"
-      multiple_pages: "Prikaz %{item_name} <b>%{from}-%{to}</b> od <b>%{count}</b> ukupno"
-    combo_nav_js: "<label>Stranica %{page_input} od %{pages}</label>"
-    items_selector_js: "<label>Prikaži %{items_input} %{item_name} po stranici</label>"
+      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"

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

@@ -13,7 +13,7 @@ id:
     item_name: "item"
     info:
       no_items: "Tidak ditemukan %{item_name}"
-      single_page: "Menampilkan <b>%{count}</b> %{item_name}"
-      multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
-    combo_nav_js: "<label>Halaman %{page_input} dari %{pages}</label>"
-    items_selector_js: "<label>Tampilkan %{items_input} %{item_name} per halaman</label>"
+      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"

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

@@ -15,7 +15,7 @@ it:
       other: "elementi"
     info:
       no_items: "Nessun %{item_name} trovato"
-      single_page: "Visualizzazione di <b>%{count}</b> %{item_name}"
-      multiple_pages: "Visualizzazione %{item_name} <b>%{from}-%{to}</b> di <b>%{count}</b> in totale"
-    combo_nav_js: "<label>Pagina %{page_input} di %{pages}</label>"
-    items_selector_js: "<label>Mostra %{items_input} %{item_name} per pagina</label>"
+      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"

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

@@ -13,7 +13,7 @@ ja:
     item_name: "結果"
     info:
       no_items: "見つかりませんでした"
-      single_page: "<b>%{count}</b> 件の%{item_name}"
-      multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
-    combo_nav_js: "<label>%{page_input} / %{pages} ページ</label>"
-    items_selector_js: "<label>%{items_input} 件ずつ表示</label>"
+      single_page: "%{count} 件の%{item_name}"
+      multiple_pages: "%{count} 件中 %{from}-%{to} 件目の%{item_name}を表示中"
+    combo_nav_js: "%{page_input} / %{pages} ページ"
+    items_selector_js: "%{items_input} 件ずつ表示"

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

@@ -13,7 +13,7 @@ km:
     item_name: "ធាតុ"
     info:
       no_items: "មិនមាន %{item_name} ទេ"
-      single_page: "បង្ហាញ <b>%{count}</b> %{item_name}"
-      multiple_pages: "បង្ហាញ %{item_name} <b>%{from}-%{to}</b> នៃ <b>%{count}</b> ជាចំនួនសរុប"
-    combo_nav_js: "<label>ទំព័រ %{page_input} នៃ %{pages}</label>"
-    items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"
+      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} ក្នុង ១ ទំព័រ"

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

@@ -13,7 +13,7 @@ ko:
     item_name: "항목"
     info:
       no_items: "%{item_name} 없음"
-      single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
-      multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
-    combo_nav_js: "<label>총 %{pages} 중 %{page_input} 페이지</label>"
-    items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"
+      single_page: "%{count}개의 %{item_name} 표시됨"
+      multiple_pages: "총 %{count}개의 %{item_name} 중 %{from}-%{to}"
+    combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
+    items_selector_js: "페이지 당 %{items_input}개 표시%"

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

@@ -15,7 +15,7 @@ nb:
       other: "resultater"
     info:
       no_items: "Ingen %{item_name} funnet"
-      single_page: "Viser <b>%{count}</b> %{item_name}"
-      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
-    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
-    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"
+      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"

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

@@ -15,7 +15,7 @@ nl:
       other: "stuks"
     info:
       no_items: "Geen %{item_name} gevonden"
-      single_page: "Toont <b>%{count}</b> %{item_name}"
-      multiple_pages: "Toont <b>%{from}-%{to}</b> %{item_name} van <b>%{count}</b> in totaal"
-    combo_nav_js: "<label>Pagina %{page_input} van %{pages}</label>"
-    items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"
+      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"

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

@@ -15,7 +15,7 @@ nn:
       other: "resultat"
     info:
       no_items: "Ingen %{item_name} funne"
-      single_page: "Viser <b>%{count}</b> %{item_name}"
-      multiple_pages: "Viser %{item_name} <b>%{from}-%{to}</b> av totalt <b>%{count}</b>"
-    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
-    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"
+      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"

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

@@ -19,7 +19,7 @@ pl:
       other: "elementów"
     info:
       no_items: "Nie znaleziono %{item_name}"
-      single_page: "Wyświetlono <b>%{count}</b> %{item_name}"
-      multiple_pages: "Wyświetlono %{item_name} <b>%{from}-%{to}</b> z wszystkich <b>%{count}</b>"
-    combo_nav_js: "<label>Strona %{page_input} z %{pages}</label>"
-    items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"
+      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"

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

@@ -17,5 +17,5 @@ pt-BR:
       no_items: "Sem resultados"
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
-    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
-    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"
+    combo_nav_js: "Página %{page_input} de %{pages}"
+    items_selector_js: "Mostrar %{items_input} %{item_name} por página"

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

@@ -17,5 +17,5 @@ pt:
       no_items: "Sem resultados"
       single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} de um total de %{count}"
-    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
-    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"
+    combo_nav_js: "Página %{page_input} de %{pages}"
+    items_selector_js: "Mostrar %{items_input} %{item_name} por página"

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

@@ -21,7 +21,7 @@ ru:
       other: "записей"
     info:
       no_items: "Пока %{item_name} нет"
-      single_page: "<b>%{count}</b> %{item_name}"
-      multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
-    combo_nav_js: "<label>Страница %{page_input} из %{pages}</label>"
-    items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"
+      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} на странице"

data/{lib → gem}/locales/sr.yml

@@ -19,7 +19,7 @@ sr:
       other: "ставки"
     info:
       no_items: "Нema пронађених %{item_name}"
-      single_page: "Приказује се <b>%{count}</b> %{item_name}"
-      multiple_pages: "Приказ %{item_name} <b>%{from}-%{to}</b> од <b>%{count}</b> укупно"
-    combo_nav_js: "<label>Страниca %{page_input} од %{pages}</label>"
-    items_selector_js: "<label>Прикажи %{items_input} %{item_name} по страниcи</label>"
+      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и"

data/{lib → gem}/locales/sv-SE.yml

@@ -15,7 +15,7 @@ sv-SE:
       other: "resultat"
     info:
       no_items: "Inga %{item_name} hittade"
-      single_page: "Visar <b>%{count}</b> %{item_name}"
-      multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
-    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
-    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"
+      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"

data/{lib → gem}/locales/sv.yml

@@ -15,7 +15,7 @@ sv:
       other: "resultat"
     info:
       no_items: "Inga %{item_name} hittade"
-      single_page: "Visar <b>%{count}</b> %{item_name}"
-      multiple_pages: "Visar %{item_name} <b>%{from}-%{to}</b> av <b>%{count}</b> totalt"
-    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
-    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"
+      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"