pagy 2.1.5 → 3.0.0

data/lib/locales/ja.yml

@@ -1,20 +1,20 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 ja:
   pagy:
+
+    item_name: "結果"
+
     nav:
       prev: "‹ 前へ"
       next: "次へ ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "見つかりませんでした"
-        one: "<b>1</b> 件の%{item_name}"
-        other: "<b>%{count}</b> 件の%{item_name}"
+      no_items: "見つかりませんでした"
+      single_page: "<b>%{count}</b> 件の%{item_name}"
       multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
-      item_name:
-        zero: "結果"
-        one: "結果"
-        other: "結果"
-    compact: "%{page_input} / %{pages} ページ"
-    items:
-      one: "%{items_input} 件ずつ表示"
-      other: "%{items_input} 件ずつ表示"
+
+    combo_nav_js: "%{page_input} / %{pages} ページ"
+
+    items_selector_js: "%{items_input} 件ずつ表示"

data/lib/locales/nb.yml

@@ -1,20 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 nb:
   pagy:
+
+    item_name:
+      one: "resultat"
+      other: "resultater"
+
     nav:
       prev: "‹ Forrige"
       next: "Neste ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Ingen %{item_name} funnet"
-        one: "Viser <b>1</b> %{item_name}"
-        other: "Viser <b>alle %{count}</b> %{item_name}"
+      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>"
-      item_name:
-        zero: "resultater"
-        one: "resultat"
-        other: "resultater"
-    compact: "Side %{page_input} av %{pages}"
-    items:
-      one: "Vis %{items_input} resultat per side"
-      other: "Vis %{items_input} resultater per side"
+
+    combo_nav_js: "Side %{page_input} av %{pages}"
+
+    items_selector_js: "Vis %{items_input} %{item_name} per side"

data/lib/locales/nl.yml

@@ -1,20 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 nl:
   pagy:
+
+    item_name:
+      one: "stuk"
+      other: "stuks"
+
     nav:
       prev: "‹ Vorige"
       next: "Volgende ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Geen %{item_name} gevonden"
-        one: "Toont <b>1</b> %{item_name}"
-        other: "Toont <b>alle %{count}</b> %{item_name}"
+      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"
-      item_name:
-        zero: "stuks"
-        one: "stuk"
-        other: "stuks"
-    compact: "Pagina %{page_input} van %{pages}"
-    items:
-      one: "Toont %{items_input} item per pagina"
-      other: "Toont %{items_input} items per pagina"
+
+    combo_nav_js: "Pagina %{page_input} van %{pages}"
+
+    items_selector_js: "Toont %{items_input} %{item_name} per pagina"

data/lib/locales/pl.yml

@@ -0,0 +1,24 @@
+# :polish pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+pl:
+  pagy:
+
+    item_name:
+      one: "element"
+      few: "elementy"
+      many: "elementów"
+      other: "elementów"
+
+    nav:
+      prev: "‹ Poprzednia"
+      next: "Następna ›"
+      gap: "…"
+
+    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: "Strona %{page_input} z %{pages}"
+
+    items_selector_js: "Pokaż %{items_input} %{item_name} na stronie"

data/lib/locales/pt-br.yml

@@ -1,20 +1,22 @@
+# :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 pt-br:
   pagy:
+
+    item_name:
+      one: "item"
+      other: "itens"
+
     nav:
       prev: "‹ Anterior"
       next: "Próximo ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Sem resultados"
-        one: "Mostrando 1 %{item_name}"
-        other: "Mostrando %{count} %{item_name}"
+      no_items: "Sem resultados"
+      single_page: "Mostrando %{count} %{item_name}"
       multiple_pages: "Mostrando %{item_name} %{from}-%{to} do total de %{count}"
-      item_name:
-        zero: "itens"
-        one: "item"
-        other: "itens"
-    compact: "Página %{page_input} de %{pages}"
-    items:
-      one: "Mostrar %{items_input} item por página"
-      other: "Mostrar %{items_input} itens por página"
+
+    combo_nav_js: "Página %{page_input} de %{pages}"
+
+    items_selector_js: "Mostrar %{items_input} %{item_name} por página"

data/lib/locales/ru.yml

@@ -1,25 +1,24 @@
+# :east_slavic pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 ru:
   pagy:
+
+    item_name:
+      one: "запись"
+      few: "записи"
+      many: "записей"
+      other: "записей"
+
     nav:
       prev: "‹ Назад"
       next: "Вперёд ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Пока %{item_name} нет"
-        one: "<b>1</b> %{item_name}"
-        few: "<b>%{count}</b> %{item_name}"
-        many: "Всего <b>%{count}</b> %{item_name}"
-        other: "Всего <b>%{count}</b> %{item_name}"
+      no_items: "Пока %{item_name} нет"
+      single_page: "<b>%{count}</b> %{item_name}"
       multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
-      item_name:
-        one: "запись"
-        few: "записи"
-        many: "записей"
-        other: "записей"
-    compact: "Страница %{page_input} из %{pages}"
-    items:
-      one: "Показать %{items_input} записей на странице"
-      few: "Показать %{items_input} записей на странице"
-      many: "Показать %{items_input} записей на странице"
-      other: "Показать %{items_input} записей на странице"
+
+    combo_nav_js: "Страница %{page_input} из %{pages}"
+
+    items_selector_js: "Показать %{items_input} %{item_name} на странице"

data/lib/locales/se.yml

@@ -1,20 +1,23 @@
+# :one_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 se:
   pagy:
+
+    item_name:
+      one: "resultat"
+      two: "resultat"
+      other: "resultat"
+
     nav:
       prev: "‹ Föregående"
       next: "Nästa ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Inga %{item_name} hittade"
-        one: "Visar <b>1</b> %{item_name}"
-        other: "Visar <b>alla %{count}</b> %{item_name}"
+      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"
-      item_name:
-        zero: "resultat"
-        one: "resultat"
-        other: "resultat"
-    compact: "Sida %{page_input} av %{pages}"
-    items:
-      one: "Visa %{items_input} resultat per sida"
-      other: "Visa %{items_input} resultat per sida"
+
+    combo_nav_js: "Sida %{page_input} av %{pages}"
+
+    items_selector_js: "Visa %{items_input} %{item_name} per sida"

data/lib/locales/tr.yml

@@ -1,20 +1,20 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 tr:
   pagy:
+
+    item_name: "kayıt"
+
     nav:
       prev: "‹ Önceki"
       next: "Sonraki ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "Hiç %{item_name} bulunamadı."
-        one: "<b>1</b> %{item_name} gösteriliyor."
-        other: "Toplam <b>%{count}</b> %{item_name} gösteriliyor."
-      multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor."
-      item_name:
-        zero: "kayıt"
-        one: "kayıt"
-        other: "kayıt"
-    compact: "Sayfa %{page_input} / %{pages}"
-    items:
-      one: "Sayfada %{items_input} kayıt göster"
-      other: "Sayfada %{items_input} kayıt göster"
+      no_items: "Hiç %{item_name} bulunamadı"
+      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}"
+
+    items_selector_js: "Sayfada %{items_input} %{item_name} göster"

data/lib/locales/utils/loader.rb

@@ -4,7 +4,7 @@
 # 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
-p11n = 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
@@ -16,19 +16,12 @@ flatten = lambda do |hash, key=''|
             end
           end
 
-normalized_locales = {'zh-cn'=>'zh-CN', 'zh-hk'=>'zh-HK'}
-
 # loader proc
 lambda do |i18n, *args|
   i18n.clear
   args.each do |arg|
-    if normalized_locales.key?(arg[:locale])
-      right_locale = normalized_locales[arg[:locale]]
-      Warning.warn("\n*** WARNING *** [Pagy::I18n.load] The '#{arg[:locale]}' locale is incorrect and deprecated, please use '#{right_locale}'\n\n")
-      arg[:locale] = right_locale
-    end
     arg[:filepath]  ||= Pagy.root.join('locales', "#{arg[:locale]}.yml")
-    arg[:pluralize] ||= p11n[arg[:locale]]
+    arg[:pluralize] ||= plurals[arg[:locale]]
     hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad
     hash.key?(arg[:locale]) or raise ArgumentError, %(Pagy::I18n.load: :locale "#{arg[:locale]}" not found in :filepath "#{arg[:filepath].inspect}")
     i18n[arg[:locale]] = [flatten.call(hash[arg[:locale]]), arg[:pluralize]]

data/lib/locales/utils/p11n.rb

@@ -6,46 +6,72 @@
 # It defines the pluralization procs and gets eval(ed) and gc-collected at Pagy::I18n.load time.
 
 # utility variables
-zero_one   = ['zero', 'one'].freeze
-from2to4   = (2..4).freeze
-from5to9   = (5..9).freeze
-from11to14 = (11..14).freeze
-from12to14 = (12..14).freeze
+from0to1   = [0,1].freeze
+from2to4   = [2,3,4].freeze
+from5to9   = [5,6,7,8,9].freeze
+from11to14 = [11,12,13,14].freeze
+from12to14 = [12,13,14].freeze
 
 # Pluralization (p11n)
+# Compliant with the I18n gem
 # A pluralization proc returns a plural type string based on the passed count
-# Each proc may apply to one or more locales below
+# Each proc may apply to one or more locales below.
+# Pluralization logic adapted from https://github.com/svenfuchs/rails-i18n
 p11n = {
-  zero_one_other: lambda {|count| zero_one[count] || 'other'},
-
-  zero_one_few_many_other: lambda do |count|
-    mod10, mod100 = count % 10, count % 100
-    if count == 0                                                           ; 'zero'
-    elsif mod10 == 1 && mod100 != 11                                        ; 'one'
-    elsif from2to4.cover?(mod10) && !from12to14.cover?(mod100)              ; 'few'
-    elsif mod10 == 0 || from5to9.cover?(mod10) || from11to14.cover?(mod100) ; 'many'
-    else                                                                      'other'
+  one_other: lambda {|n| n == 1 ? 'one' : 'other'},    # default
+
+  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'
+    end
+  end,
+
+  one_two_other: lambda do |n|
+    if n == 1    ; 'one'
+    elsif n == 2 ; 'two'
+    else           'other'
     end
   end,
 
-  pl: lambda do |count|
-    mod10, mod100 = count % 10, count % 100
-    if count == 0                                                                       ; 'zero'
-    elsif count == 1                                                                    ; 'one'
-    elsif from2to4.cover?(mod10) && !from12to14.cover?(mod100)                          ; 'few'
-    elsif [0, 1].include?(mod10) || from5to9.cover?(mod10) || from12to14.cover?(mod100) ; 'many'
-    else                                                                                  'other'
+  one_upto_two_other: lambda {|n| n && n >= 0 && n < 2 ? 'one' : 'other'},
+
+  other: Proc.new { 'other' },
+
+  polish: lambda do |n|
+    n ||= 0
+    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'
     end
   end
 }
 
 # Hash of locale/pluralization pairs
-# Contain all the entries for all the locales defined as dictionaries.
+# It contains all the entries for all the locales defined as dictionaries.
 # The default pluralization for locales not explicitly listed here
-# is the :zero_one_other pluralization proc (used for English)
-Hash.new(p11n[:zero_one_other]).tap do |hash|
-  hash['ru'] = p11n[:zero_one_few_many_other]
-  hash['pl'] = p11n[:pl]
+# is the :one_other pluralization proc (used for English)
+plurals = Hash.new(p11n[:one_other]).tap do |hash|
+  hash['id'] = p11n[:other]
+  hash['fr'] = p11n[:one_upto_two_other]
+  hash['ja'] = p11n[:other]
+  hash['pl'] = p11n[:polish]
+  hash['ru'] = p11n[:east_slavic]
+  hash['se'] = p11n[:one_two_other]
+  hash['tr'] = p11n[:other]
+  hash['zh-CN'] = p11n[:other]
+  hash['zh-HK'] = p11n[:other]
+  hash['zh-TW'] = p11n[:other]
 end
 
+[ plurals, p11n ]
+
 # PR for other locales and pluralizations are very welcome. Thanks!

data/lib/locales/zh-CN.yml

@@ -1,20 +1,20 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 zh-CN:
   pagy:
+
+    item_name: ""
+
     nav:
       prev: "‹ 上一页"
       next: "下一页 ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "%{item_name}未找到"
-        one: "显示 <b>1</b> 项%{item_name}"
-        other: "显示<b>所有 %{count}</b> 项%{item_name}"
+      no_items: "项目未找到"
+      single_page: "显示<b>%{count}</b> 项%{item_name}"
       multiple_pages: "共 <b>%{count}</b> 项%{item_name}，显示 <b>%{from}-%{to}</b>"
-      item_name:
-        zero: "项目"
-        one: ""
-        other: ""
-    compact: "第 %{page_input} / %{pages} 页"
-    items:
-      one: "每页显示 %{items_input} 条"
-      other: "每页显示 %{items_input} 条"
+
+    combo_nav_js: "第 %{page_input} / %{pages} 页"
+
+    items_selector_js: "每页显示 %{items_input} 条%"

data/lib/locales/zh-HK.yml

@@ -1,20 +1,20 @@
+# :other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
 zh-HK:
   pagy:
+
+    item_name: ""
+
     nav:
       prev: "‹ 上一頁"
       next: "下一頁 ›"
       gap: "…"
+
     info:
-      single_page:
-        zero: "%{item_name}未搵到"
-        one: "顯示 <b>1</b> %{item_name}"
-        other: "顯示<b>所有 %{count}</b> %{item_name}"
-      multiple_pages: "共 <b>%{count}</b> %{item_name}，顯示 <b>%{from}-%{to}</b>"
-      item_name:
-        zero: "記錄"
-        one: ""
-        other: ""
-    compact: "第 %{page_input} / %{pages} 頁"
-    items:
-      one: "每頁顯示 %{items_input} 記錄"
-      other: "每頁顯示 %{items_input} 記錄"
+      no_items: "記錄未搵到"
+      single_page: "顯示 <b>%{count}</b> %{item_name}"
+      multiple_pages: "共 <b>%{count}</b>  %{item_name}，顯示 <b>%{from}-%{to}</b>"
+
+    combo_nav_js: "第 %{page_input} / %{pages} 頁"
+
+    items_selector_js: "每頁顯示 %{items_input} 記錄"