pagy 3.8.0 → 4.10.1

data/lib/locales/en.yml

@@ -17,6 +17,6 @@ en:
       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: "Page %{page_input} of %{pages}"
+    combo_nav_js: "<label>Page %{page_input} of %{pages}</label>"
 
-    items_selector_js: "Show %{items_input} %{item_name} per page"
+    items_selector_js: "<label>Show %{items_input} %{item_name} per page</label>"

data/lib/locales/es.yml

@@ -17,6 +17,6 @@ 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}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/fr.yml

@@ -17,6 +17,6 @@ fr:
       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: "Page %{page_input} sur %{pages}"
+    combo_nav_js: "<label>Page %{page_input} sur %{pages}</label>"
 
-    items_selector_js: "Afficher %{items_input} %{item_name} par page"
+    items_selector_js: "<label>Afficher %{items_input} %{item_name} par page</label>"

data/lib/locales/hr.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+hr:
+  pagy:
+
+    item_name:
+      one: "stavka"
+      few: "stavke"
+      many: "stavki"
+      other: "stavki"
+
+    nav:
+      prev: "‹ Prethodna"
+      next: "Sljedeća  ›"
+      gap: "…"
+
+    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>"

data/lib/locales/id.yml

@@ -15,6 +15,6 @@ id:
       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: "Halaman %{page_input} dari %{pages}"
+    combo_nav_js: "<label>Halaman %{page_input} dari %{pages}</label>"
 
-    items_selector_js: "Tampilkan %{items_input} %{item_name} per halaman"
+    items_selector_js: "<label>Tampilkan %{items_input} %{item_name} per halaman</label>"

data/lib/locales/it.yml

@@ -17,6 +17,6 @@ it:
       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: "Pagina %{page_input} di %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} di %{pages}</label>"
 
-    items_selector_js: "Mostra %{items_input} %{item_name} per pagina"
+    items_selector_js: "<label>Mostra %{items_input} %{item_name} per pagina</label>"

data/lib/locales/ja.yml

@@ -15,6 +15,6 @@ ja:
       single_page: "<b>%{count}</b> 件の%{item_name}"
       multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
 
-    combo_nav_js: "%{page_input} / %{pages} ページ"
+    combo_nav_js: "<label>%{page_input} / %{pages} ページ</label>"
 
-    items_selector_js: "%{items_input} 件ずつ表示"
+    items_selector_js: "<label>%{items_input} 件ずつ表示</label>"

data/lib/locales/km.yml

@@ -14,6 +14,6 @@ km:
       single_page: "បង្ហាញ <b>%{count}</b> %{item_name}"
       multiple_pages: "បង្ហាញ %{item_name} <b>%{from}-%{to}</b> នៃ <b>%{count}</b> ជាចំនួនសរុប"
 
-    combo_nav_js: "ទំព័រ %{page_input} នៃ %{pages}"
+    combo_nav_js: "<label>ទំព័រ %{page_input} នៃ %{pages}</label>"
 
-    items_selector_js: "បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ"
+    items_selector_js: "<label>បង្ហាញ %{items_input} %{item_name} ក្នុង ១ ទំព័រ</label>"

data/lib/locales/ko.yml

@@ -15,6 +15,6 @@ ko:
       single_page: "<b>%{count}</b>개의 %{item_name} 표시됨"
       multiple_pages: "총 <b>%{count}</b>개의 %{item_name} 중 <b>%{from}-%{to}</b>"
 
-    combo_nav_js: "총 %{pages} 중 %{page_input} 페이지"
+    combo_nav_js: "<label>총 %{pages} 중 %{page_input} 페이지</label>"
 
-    items_selector_js: "페이지 당 %{items_input}개 표시%"
+    items_selector_js: "<label>페이지 당 %{items_input}개 표시%</label>"

data/lib/locales/nb.yml

@@ -17,6 +17,6 @@ nb:
       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: "Side %{page_input} av %{pages}"
+    combo_nav_js: "<label>Side %{page_input} av %{pages}</label>"
 
-    items_selector_js: "Vis %{items_input} %{item_name} per side"
+    items_selector_js: "<label>Vis %{items_input} %{item_name} per side</label>"

data/lib/locales/nl.yml

@@ -17,6 +17,6 @@ nl:
       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: "Pagina %{page_input} van %{pages}"
+    combo_nav_js: "<label>Pagina %{page_input} van %{pages}</label>"
 
-    items_selector_js: "Toont %{items_input} %{item_name} per pagina"
+    items_selector_js: "<label>Toont %{items_input} %{item_name} per pagina</label>"

data/lib/locales/pl.yml

@@ -19,6 +19,6 @@ pl:
       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: "Strona %{page_input} z %{pages}"
+    combo_nav_js: "<label>Strona %{page_input} z %{pages}</label>"
 
-    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"
+    items_selector_js: "<label>Pokaż %{items_input} %{item_name} na stronie</label>"

data/lib/locales/pt-BR.yml

@@ -17,6 +17,6 @@ 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}"
+    combo_nav_js: "<label>Página %{page_input} de %{pages}</label>"
 
-    items_selector_js: "Mostrar %{items_input} %{item_name} por página"
+    items_selector_js: "<label>Mostrar %{items_input} %{item_name} por página</label>"

data/lib/locales/pt.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+pt:
+  pagy:
+
+    item_name:
+      one: "item"
+      other: "itens"
+
+    nav:
+      prev: "‹ Anterior"
+      next: "Próximo ›"
+      gap: "…"
+
+    info:
+      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>"

data/lib/locales/ru.yml

@@ -19,6 +19,6 @@ ru:
       single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
 
-    combo_nav_js: "Страница %{page_input} из %{pages}"
+    combo_nav_js: "<label>Страница %{page_input} из %{pages}</label>"
 
-    items_selector_js: "Показать %{items_input} %{item_name} на странице"
+    items_selector_js: "<label>Показать %{items_input} %{item_name} на странице</label>"

data/lib/locales/sr.yml

@@ -0,0 +1,23 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+sr:
+  pagy:
+    item_name:
+      one: "ставка"
+      few: "ставкe"
+      many: "ставки"
+      other: "ставки"
+
+    nav:
+      prev: "‹ Претходна"
+      next: "Следећa  ›"
+      gap: "…"
+
+    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>"

data/lib/locales/sv-SE.yml

@@ -18,6 +18,6 @@ sv-SE:
       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: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sv.yml

@@ -18,6 +18,6 @@ sv:
       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: "Sida %{page_input} av %{pages}"
+    combo_nav_js: "<label>Sida %{page_input} av %{pages}</label>"
 
-    items_selector_js: "Visa %{items_input} %{item_name} per sida"
+    items_selector_js: "<label>Visa %{items_input} %{item_name} per sida</label>"

data/lib/locales/sw.yml

@@ -0,0 +1,22 @@
+# :one_other pluralization
+
+sw:
+  pagy:
+
+    item_name:
+      one: "kifaa"
+      other: "vifaa"
+
+    nav:
+      prev: "‹ Awali"
+      next: "Ifuatayo ›"
+      gap: "…"
+
+    info:
+      no_items: "Hamna %{item_name} vilivyopatikana"
+      single_page: "Inaonyesha %{item_name} <b>%{count}</b>"
+      multiple_pages: "Inaonyesha %{item_name} <b>%{from}-%{to}</b> ya <b>%{count}</b> kwa jumla"
+
+    combo_nav_js: "<label>Kurasa %{page_input} ya %{pages}</label>"
+
+    items_selector_js: "<label>Onyesha %{items_input} %{item_name} kwa kila ukurasa</label>"

data/lib/locales/tr.yml

@@ -15,6 +15,6 @@ tr:
       single_page: "Toplam <b>%{count}</b> %{item_name} gösteriliyor"
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor"
 
-    combo_nav_js: "Sayfa %{page_input} / %{pages}"
+    combo_nav_js: "<label>Sayfa %{page_input} / %{pages}</label>"
 
-    items_selector_js: "Sayfada %{items_input} %{item_name} göster"
+    items_selector_js: "<label>Sayfada %{items_input} %{item_name} göster</label>"

data/lib/locales/uk.yml

@@ -0,0 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+uk:
+  pagy:
+
+    item_name:
+      one: "запис"
+      few: "записів"
+      many: "записів"
+      other: "записів"
+
+    nav:
+      prev: "‹ Назад"
+      next: "Далі ›"
+      gap: "…"
+
+    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>"

data/lib/locales/utils/i18n.rb

@@ -1,25 +1,17 @@
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 # this file returns the I18n hash used as default alternative to the i18n gem
 
-Pagy::DEPRECATED_LOCALES = {'pt-br' =>'pt-BR', 'se' => 'sv-SE'}
-
 Hash.new{|h,_| h.first[1]}.tap do |i18n_hash|   # first loaded locale used as default
   i18n_hash.define_singleton_method(:load) do |*load_args|
     # eval: we don't need to keep the loader proc in memory
     eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n_hash, *load_args)   #rubocop:disable Security/Eval
   end
-  i18n_hash.define_singleton_method(:t) do |locale, path, vars={}|
-    if Pagy::DEPRECATED_LOCALES.key?(locale)
-      new_locale = Pagy::DEPRECATED_LOCALES[locale]
-      $stderr.puts("WARNING: the Pagy locale '#{locale}' is deprecated; use '#{new_locale}' instead")
-      locale = new_locale
-    end
+  i18n_hash.define_singleton_method(:t) do |locale, key, **opts|
     data, pluralize = self[locale]
-    translate = data[path] || vars[:count] && data[path+=".#{pluralize.call(vars[:count])}"] or return %([translation missing: "#{path}"])
-    translate.call(vars)
+    translate = data[key] || opts[:count] && data[key+=".#{pluralize.call(opts[:count])}"] or return %([translation missing: "#{key}"])
+    translate.call(opts)
   end
   i18n_hash.load(locale: 'en')
 end

data/lib/locales/utils/loader.rb

@@ -1,18 +1,20 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 # the whole file will be eval'ed/executed and gc-collected after returning/executing the loader proc
 
 # eval: no need for the whole file in memory
-plurals, _ = eval(Pagy.root.join('locales', 'utils', 'p11n.rb').read)   #rubocop:disable Security/Eval
+plurals, = eval Pagy.root.join('locales', 'utils', 'p11n.rb').read   # rubocop:disable Security/Eval
 
 # flatten the dictionary file nested keys
 # convert each value to a simple ruby interpolation proc
 flatten = lambda do |hash, key=''|
             hash.each.reduce({}) do |h, (k, v)|
-              v.is_a?(Hash) \
-                ? h.merge!(flatten.call(v, "#{key}#{k}."))
-                : h.merge!(eval %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})) #rubocop:disable Security/Eval
+              if v.is_a?(Hash)
+                h.merge! flatten.call(v, "#{key}#{k}.")
+              else
+                code = %({"#{key}#{k}" => lambda{|vars|"#{v.gsub(/%{[^}]+?}/){|m| "\#{vars[:#{m[2..-2]}]||'#{m}'}" }}"}})
+                h.merge! eval(code) # rubocop:disable Security/Eval
+              end
             end
           end
 
@@ -20,11 +22,6 @@ flatten = lambda do |hash, key=''|
 lambda do |i18n, *args|
   i18n.clear
   args.each do |arg|
-    if Pagy::DEPRECATED_LOCALES.key?(arg[:locale])
-      new_locale = Pagy::DEPRECATED_LOCALES[arg[:locale]]
-      $stderr.puts("WARNING: the Pagy locale '#{arg[:locale]}' is deprecated; use '#{new_locale}' instead")
-      arg[:locale] = new_locale
-    end
     arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
     arg[:pluralize] ||= plurals[arg[:locale]]
     hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad

data/lib/locales/utils/p11n.rb

@@ -1,5 +1,4 @@
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# encoding: utf-8
 # frozen_string_literal: true
 
 # This file adds support for multiple built-in plualization types.
@@ -18,41 +17,68 @@ from12to14 = [12,13,14].freeze
 # Each proc may apply to one or more locales below.
 # Pluralization logic adapted from https://github.com/svenfuchs/rails-i18n
 p11n = {
-  one_other: lambda {|n| n == 1 ? 'one' : 'other'},    # default
+  one_other: -> (n){ n == 1 ? 'one' : 'other' },    # default
+
+  arabic: lambda do |n|
+    n ||= 0
+    mod100 = n % 100
+
+    case
+    when n == 0                         then 'zero'      # rubocop:disable Style/NumericPredicate
+    when n == 1                         then 'one'
+    when n == 2                         then 'two'
+    when (3..10).to_a.include?(mod100)  then 'few'
+    when (11..99).to_a.include?(mod100) then 'many'
+    else                                     'other'
+    end
+  end,
 
   east_slavic: lambda do |n|
     n ||= 0
     mod10 = n % 10
     mod100 = n % 100
 
-    if    mod10 == 1 && mod100 != 11                                            ; 'one'
-    elsif from2to4.include?(mod10) && !from12to14.include?(mod100)              ; 'few'
-    elsif mod10 == 0 || from5to9.include?(mod10) || from11to14.include?(mod100) ; 'many'
-    else                                                                          'other'
+    case
+    when mod10 == 1 && mod100 != 11                                            then 'one'
+    when from2to4.include?(mod10) && !from12to14.include?(mod100)              then 'few'
+    when mod10 == 0 || from5to9.include?(mod10) || from11to14.include?(mod100) then 'many' # rubocop:disable Style/NumericPredicate
+    else                                                                            'other'
     end
   end,
 
   one_two_other: lambda do |n|
-    if n == 1    ; 'one'
-    elsif n == 2 ; 'two'
-    else           'other'
+    case n
+    when 1 then 'one'
+    when 2 then 'two'
+    else        'other'
     end
   end,
 
-  one_upto_two_other: lambda {|n| n && n >= 0 && n < 2 ? 'one' : 'other'},
+  one_upto_two_other: -> (n){ n && n >= 0 && n < 2 ? 'one' : 'other' },
 
-  other: Proc.new { 'other' },
+  other: -> (*){ 'other' },
 
   polish: lambda do |n|
     n ||= 0
-    mod10 = n % 10
+    mod10  = n % 10
     mod100 = n % 100
-    if n == 1                                                                  ; 'one'
-    elsif from2to4.include?(mod10) && !from12to14.include?(mod100)             ; 'few'
-    elsif (from0to1 + from5to9).include?(mod10) || from12to14.include?(mod100) ; 'many'
-    else                                                                         'other'
+
+    case
+    when n == 1                                                               then 'one'
+    when from2to4.include?(mod10) && !from12to14.include?(mod100)             then 'few'
+    when (from0to1 + from5to9).include?(mod10) || from12to14.include?(mod100) then 'many'
+    else                                                                           'other'
+    end
+  end,
+
+  west_slavic: lambda do |n|
+    case n
+    when 1       then 'one'
+    when 2, 3, 4 then 'few'
+    else              'other'
     end
   end
+
 }
 
 # Hash of locale/pluralization pairs
@@ -60,19 +86,25 @@ p11n = {
 # The default pluralization for locales not explicitly listed here
 # is the :one_other pluralization proc (used for English)
 plurals = Hash.new(p11n[:one_other]).tap do |hash|
+  hash['ar']    = p11n[:arabic]
+  hash['bs']    = p11n[:east_slavic]
+  hash['cs']    = p11n[:west_slavic]
   hash['id']    = p11n[:other]
   hash['fr']    = p11n[:one_upto_two_other]
+  hash['hr']    = p11n[:east_slavic]
   hash['ja']    = p11n[:other]
+  hash['km']    = p11n[:other]
   hash['ko']    = p11n[:other]
   hash['pl']    = p11n[:polish]
   hash['ru']    = p11n[:east_slavic]
+  hash['sr']    = p11n[:east_slavic]
   hash['sv']    = p11n[:one_two_other]
   hash['sv-SE'] = p11n[:one_two_other]
   hash['tr']    = p11n[:other]
+  hash['uk']    = p11n[:east_slavic]
   hash['zh-CN'] = p11n[:other]
   hash['zh-HK'] = p11n[:other]
   hash['zh-TW'] = p11n[:other]
-  hash['km']    = p11n[:other]
 end
 
 [ plurals, p11n ]