pagy 0.19.4 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebd88dd8d6c3296619f85da10c32cbe324dcfc6fde4b05835fba59c347e8549
-  data.tar.gz: 50830d329a8adb1cba1890524ce4b7f8309628b02189a2d0891d30f5f24374b2
+  metadata.gz: 575c195847961ea0480d52ab96a6a1cff02684261069c254979437596d443244
+  data.tar.gz: 52a796fa7f8c7323a5445082f24d0ebbd77ee7931870af203836ee3fe686ab36
 SHA512:
-  metadata.gz: 01f5de145efd5ca482eb0c8e7f82ae62438ef7c4547d8492b0837b4de3b2d9baf02a0366281f447930a52d97b405a3587e6dd578e653f133f13e2e4ab55a3cec
-  data.tar.gz: 454dba7421ee82dde42a71101a587f120120c0e2822863da805e61787baa47908fffb01aed574d91bf1a6bfc062222275f453c41805cd9b6c786e8ab329d6ca9
+  metadata.gz: f907980d15f3056b660ee7acf17fa2f414ad2b1e2b0eca4538aa1c79103ffe052a7b0fa47a31e11258f68f3d74d0042768bb19683edec6e273832cea2c5bf733
+  data.tar.gz: 444b734960e91e64fc1d115a71e50a2d729fd93f1c99da97cd6c8e364d0bfcae26bc1dd5f24b9d7c44e2aee0b19d21a0b39f3e18f7cc48554b0853f87ef9f3b1

data/lib/config/pagy.rb

@@ -101,8 +101,9 @@
 # I18n: faster internal pagy implementation (does not use the I18n gem)
 # Use only for single language apps that don't need dynamic translation between multiple languages
 # See https://ddnexus.github.io/pagy/api/frontend#i18n
-# Notice: Do not use the following 2 lines if you use the i18n extra below
-# Pagy::Frontend::I18N.load(file:'path/to/dictionary.yml', language:'en')            # load a custom file
+# Notice: Do not use any of the following lines if you use the i18n extra below
+# Pagy::Frontend::I18N.load(file: Pagy.root.join('locale', 'es.yml'), language:'es') # load 'es' pagy language file
+# Pagy::Frontend::I18N.load(file:'path/to/dictionary.yml', language:'en')            # load a custom 'en' file
 # Pagy::Frontend::I18N[:plural] = -> (count) {(['zero', 'one'][count] || 'other')}   # default
 
 # I18n: Use the `I18n` gem instead of the pagy implementation

data/lib/locales/en.yml

@@ -0,0 +1,20 @@
+en:
+  pagy:
+    nav:
+      prev: "‹ Prev"
+      next: "Next ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "No %{item_name} found"
+        one: "Displaying <b>1</b> %{item_name}"
+        other: "Displaying <b>all %{count}</b> %{item_name}"
+      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
+      item_name:
+        zero: "items"
+        one: "item"
+        other: "items"
+    compact: "Page %{page_input} of %{pages}"
+    items:
+      one: "Show %{items_input} item per page"
+      other: "Show %{items_input} items per page"

data/lib/locales/es.yml

@@ -0,0 +1,20 @@
+es:
+  pagy:
+    nav:
+      prev: "‹ Prev"
+      next: "Siguiente ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "Sin resultados"
+        one: "Mostrando 1 %{item_name}"
+        other: "Mostrando %{count} %{item_name}"
+      multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
+      item_name:
+        zero: "ítems"
+        one: "ítem"
+        other: "ítems"
+    compact: "Página %{page_input} de %{pages}"
+    items:
+      one: "Mostrar %{items_input} ítem por página"
+      other: "Mostrar %{items_input} ítems por página"

data/lib/locales/id.yml

@@ -0,0 +1,20 @@
+id:
+  pagy:
+    nav:
+      prev: "‹ Balik"
+      next: "Lanjut ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "Tidak ditemukan %{item_name}"
+        one: "Menampilkan <b>1</b> %{item_name}"
+        other: "Menampilkan <b>semua %{count}</b> %{item_name}"
+      multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
+      item_name:
+        zero: "item"
+        one: "item"
+        other: "item"
+    compact: "Halaman %{page_input} dari %{pages}"
+    items:
+      one: "Tampilkan %{items_input} item per halaman"
+      other: "Tampilkan %{items_input} item per halaman"

data/lib/locales/ja.yml

@@ -0,0 +1,20 @@
+ja:
+  pagy:
+    nav:
+      prev: "‹ 前へ"
+      next: "次へ ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "見つかりませんでした"
+        one: "<b>1</b> 件の%{item_name}"
+        other: "<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} 件ずつ表示"

data/lib/locales/plurals.rb

@@ -3,13 +3,25 @@
 # frozen_string_literal: true
 
 # utility variables
-zero_one = ['zero', 'one']
+zero_one   = ['zero', 'one']
+from2to4   = (2..4)
+from5to9   = (5..9)
+from11to14 = (11..14)
+from12to14 = (12..14)
 
 # Plurals
 # A plural proc returns a plural type string based on the passed count
 # Each plural proc may apply to one or more languages below
 plurals = {
-  zero_one_other: -> (count) {zero_one[count] || 'other'}
+  zero_one_other:     -> (count) {zero_one[count] || 'other'},
+  one_few_many_other: -> (count) do
+    mod10, mod100 = count % 10, count % 100
+    if    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'
+    end
+  end
 }
 
 # Languages (language/plural pairs)
@@ -17,7 +29,7 @@ plurals = {
 # The default plural for missing languages is the :zero_one_other plural (used for English)
 Hash.new(plurals[:zero_one_other]).tap do |languages|
   languages['en'] = plurals[:zero_one_other]
-
-  # PR for other languages and plurals are very welcome. Thanks!
-
+  languages['ru'] = plurals[:one_few_many_other]
 end
+
+# PR for other languages and plurals are very welcome. Thanks!

data/lib/locales/pt-br.yml

@@ -0,0 +1,20 @@
+pt-br:
+  pagy:
+    nav:
+      prev: "‹ Anterior"
+      next: "Próximo ›"
+      gap: "…"
+    info:
+      single_page:
+        zero: "Sem resultados"
+        one: "Mostrando 1 %{item_name}"
+        other: "Mostrando %{count} %{item_name}"
+      multiple_pages: "Mostrando %{item_name} %{from}-%{to} no total de %{count}"
+      item_name:
+        zero: "itens"
+        one: "item"
+        other: "itens"
+    compact: "Página %{page_input} de %{pages}"
+    items:
+      one: "Mostrar %{items_input} iten por página"
+      other: "Mostrar %{items_input} itens por página"

data/lib/locales/ru.yml

@@ -0,0 +1,25 @@
+ru:
+  pagy:
+    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}"
+      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} записей на странице"

data/lib/locales/tr.yml

@@ -0,0 +1,20 @@
+tr:
+  pagy:
+    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"

data/lib/locales/zh-cn.yml

@@ -0,0 +1,20 @@
+zh-cn:
+  pagy:
+    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} 条"

data/lib/pagy.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '0.19.4'
+class Pagy ; VERSION = '0.20.0'
 
   class OutOfRangeError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

data/lib/pagy/extras/bootstrap.rb

@@ -35,7 +35,7 @@ class Pagy
         html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="prev btn btn-primary"')
                         : %(<a class="prev btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
         input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" class="text-primary" style="padding: 0; border: none; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        html << %(<div class="pagy-compact-input btn btn-primary disabled">#{pagy_t('pagy.compact.page')} #{input} #{pagy_t('pagy.compact.of')} #{p_pages}</div>)
+        html << %(<div class="pagy-compact-input btn btn-primary disabled">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
         html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'aria-label="next" class="next btn btn-primary"')
                         : %(<a class="next btn btn-primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)

data/lib/pagy/extras/bulma.rb

@@ -36,8 +36,8 @@ class Pagy
         html << %(<div class="field is-grouped is-grouped-centered" role="group">)
         html << (p_prev ? %(<p class="control">#{link.call(p_prev, pagy_t('pagy.nav.prev'), 'class="button" aria-label="previous page"')}</p>)
                         : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.prev')}</a></p>))
-        input = %(<input class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        html << %(<div class="pagy-compact-input control level is-mobile">#{pagy_t('pagy.compact.page')}&nbsp;#{input}&nbsp;#{pagy_t('pagy.compact.of')} #{p_pages}</div>)
+        input = %(<input class="input" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin:0 0.3rem;">)
+        html << %(<div class="pagy-compact-input control level is-mobile">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
         html << (p_next ? %(<p class="control">#{link.call(p_next, pagy_t('pagy.nav.next'), 'class="button" aria-label="next page"')}</p>)
                         : %(<p class="control"><a class="button" disabled>#{pagy_t('pagy.nav.next')}</a></p>))
       html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)

data/lib/pagy/extras/foundation.rb

@@ -13,9 +13,9 @@ class Pagy
       html << (p_prev ? %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
                       : %(<li class="prev disabled">#{pagy_t('pagy.nav.prev')}</li>))
       pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        html << if    item.is_a?(Integer); %(<li>#{link.call item}</li>)                                                       # page link
-                elsif item.is_a?(String) ; %(<li class="current"><span class="show-for-sr">#{pagy_t('pagy.nav.current')}</span> #{item}</li>)  # active page
-                elsif item == :gap       ; %(<li class="ellipsis" aria-hidden="true"></li>)                                    # page gap
+        html << if    item.is_a?(Integer); %(<li>#{link.call item}</li>)                        # page link
+                elsif item.is_a?(String) ; %(<li class="current">#{item}</li>)                  # active page
+                elsif item == :gap       ; %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
                 end
       end
       html << (p_next ? %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)
@@ -34,8 +34,8 @@ class Pagy
         html << %(<div class="input-group">)
         html << (p_prev ? link.call(p_prev, pagy_t('pagy.nav.prev'), 'style="margin-bottom: 0px;" aria-label="previous" class="prev button primary"')
                         : %(<a style="margin-bottom: 0px;" class="prev button primary disabled" href="#">#{pagy_t('pagy.nav.prev')}</a>))
-        input = %(<input class="input-group-field cell shrink" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="width: #{p_pages.to_s.length+1.5}rem;">)
-        html << %(<span class="input-group-label">#{pagy_t('pagy.compact.page')}</span> #{input} <span class="input-group-label">#{pagy_t('pagy.compact.of')} #{p_pages}</span>)
+        input = %(<input class="input-group-field cell shrink" type="number" min="1" max="#{p_pages}" value="#{p_page}" style="width: #{p_pages.to_s.length+1}rem; padding: 0 0.3rem; margin: 0 0.3rem;">)
+        html << %(<span class="input-group-label">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</span>)
         html << (p_next ? link.call(p_next, pagy_t('pagy.nav.next'), 'style="margin-bottom: 0px;" aria-label="next" class="next button primary"')
                         : %(<a style="margin-bottom: 0px;" class="next button primary disabled" href="#">#{pagy_t('pagy.nav.next')}</a>))
       html << %(</div></nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)
@@ -50,9 +50,9 @@ class Pagy
       tags['before'] << (p_prev ? %(<li class="prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</li>)
                                 : %(<li class="prev disabled">#{pagy_t('pagy.nav.prev')}</li>))
       responsive[:items].each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
-        tags[item.to_s] = if    item.is_a?(Integer); %(<li>#{link.call item}</li>)                              # page link
-                          elsif item.is_a?(String) ; %(<li class="current"><span class="show-for-sr">#{pagy_t('pagy.nav.current')}</span> #{item}</li>)                        # active page
-                          elsif item == :gap       ; %(<li class="gap disabled">#{pagy_t('pagy.nav.gap')}</li>) # page gap
+        tags[item.to_s] = if    item.is_a?(Integer); %(<li>#{link.call item}</li>)                        # page link
+                          elsif item.is_a?(String) ; %(<li class="current">#{item}</li>)                  # active page
+                          elsif item == :gap       ; %(<li class="ellipsis gap" aria-hidden="true"></li>) # page gap
                           end
       end
       tags['after'] = +(p_next ? %(<li class="next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</li>)

data/lib/pagy/extras/i18n.rb

@@ -4,7 +4,7 @@ class Pagy
   # Use ::I18n gem
   module Frontend
 
-    ::I18n.load_path << Pagy.root.join('locales', 'pagy.yml')
+    ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
 
     # Override the built-in pagy_t
     def pagy_t(*args)

data/lib/pagy/extras/items.rb

@@ -36,7 +36,7 @@ class Pagy
       html = +%(<span id="pagy-items-#{id}">)
         html << %(<a href="#{pagy_url_for("#{MARKER}-page-", pagy)}"></a>)
         input = %(<input type="number" min="1" max="#{p_vars[:max_items]}" value="#{p_items}" style="padding: 0; text-align: center; width: #{p_items.to_s.length+1}rem;">)
-        html << %(#{pagy_t('pagy.items.show')} #{input} #{pagy_t('pagy.items.items')})
+        html << %(#{pagy_t('pagy.items', items_input: input, count: p_items)})
       html << %(</span><script type="application/json" class="pagy-items-json">["#{id}", "#{MARKER}", #{pagy.from}]</script>)
     end
 

data/lib/pagy/extras/materialize.rb

@@ -36,7 +36,7 @@ class Pagy
       html << (p_prev ? %(<li class="waves-effect prev" #{li_style}>#{link.call p_prev, '<i class="material-icons">chevron_left</i>', 'aria-label="previous"'}</li>)
                : %(<li class="prev disabled" #{li_style}><a href="#"><i class="material-icons">chevron_left</i></a></li>))
       input = %(<input type="number" class="browser-default" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 2px; border: none; border-radius: 2px; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-      html << %(<div class="pagy-compact-input btn-flat" style="cursor: default; padding: 0px">#{pagy_t('pagy.compact.page')} #{input} #{pagy_t('pagy.compact.of')} #{p_pages}</div>)
+      html << %(<div class="pagy-compact-input btn-flat" style="cursor: default; padding: 0px">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div>)
       html << (p_next ? %(<li class="waves-effect next" #{li_style}>#{link.call p_next, '<i class="material-icons">chevron_right</i>', 'aria-label="next"'}</li>)
                : %(<li class="next disabled" #{li_style}><a href="#"><i class="material-icons">chevron_right</i></a></li>))
       html << %(</ul></div><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)

data/lib/pagy/extras/navs.rb

@@ -17,7 +17,7 @@ class Pagy
         html << (p_prev ? %(<span class="page prev">#{link.call p_prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"'}</span> )
                         : %(<span class="page prev disabled">#{pagy_t('pagy.nav.prev')}</span> ))
         input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        html << %(<span class="pagy-compact-input" style="margin: 0 0.6rem;">#{pagy_t('pagy.compact.page')} #{input} #{pagy_t('pagy.compact.of')} #{p_pages}</span> )
+        html << %(<span class="pagy-compact-input" style="margin: 0 0.6rem;">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</span> )
         html << (p_next ? %(<span class="page next">#{link.call p_next, pagy_t('pagy.nav.next'), 'aria-label="next"'}</span>)
                         : %(<span class="page next disabled">#{pagy_t('pagy.nav.next')}</span>))
       html << %(</nav><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)

data/lib/pagy/extras/semantic.rb

@@ -33,8 +33,8 @@ class Pagy
         (html << link.call(1, '', %(style="display: none;" ))) if defined?(TRIM)
         html << (p_prev ? %(#{link.call p_prev, '<i class="left small chevron icon"></i>', 'aria-label="previous"'})
                         : %(<div class="item disabled"><i class="left small chevron icon"></i></div>))
-        input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem;">)
-        html << %(<div class="pagy-compact-input item">#{pagy_t('pagy.compact.page')}&nbsp;#{input}&nbsp;#{pagy_t('pagy.compact.of')} #{p_pages}</div> )
+        input = %(<input type="number" min="1" max="#{p_pages}" value="#{p_page}" style="padding: 0; text-align: center; width: #{p_pages.to_s.length+1}rem; margin: 0 0.3rem">)
+        html << %(<div class="pagy-compact-input item">#{pagy_t('pagy.compact', page_input: input, count: p_page, pages: p_pages)}</div> )
         html << (p_next ? %(#{link.call p_next, '<i class="right small chevron icon"></i>', 'aria-label="next"'})
                         : %(<div class="item disabled"><i class="right small chevron icon"></i></div>))
       html << %(</div><script type="application/json" class="pagy-compact-json">["#{id}", "#{MARKER}", "#{p_page}", #{!!defined?(TRIM)}]</script>)

data/lib/pagy/frontend.rb

@@ -55,7 +55,7 @@ class Pagy
     end
 
     # Pagy::Frontend::I18N
-    def (I18N = {data:{}}).load(file:Pagy.root.join('locales', 'pagy.yml'), language: 'en')
+    def (I18N = {data:{}}).load(file:Pagy.root.join('locales', 'en.yml'), language: 'en')
       self[:data]   = YAML.load_file(file)[language]
       self[:plural] = eval(Pagy.root.join('locales', 'plurals.rb').read)[language] #rubocop:disable Security/Eval
     end; I18N.load

data/lib/templates/nav_foundation.html.erb

@@ -13,8 +13,8 @@
 <% end                         -%>
 <% pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36] -%>
 <%   if    item.is_a?(Integer) -%>    <li><%== link.call(item) %></li>
-<%   elsif item.is_a?(String)  -%>    <li class="current"><span class="show-for-sr"><%== pagy_t('pagy.nav.current')%></span> <%= item %></li>
-<%   elsif item == :gap        -%>    <li class="disabled gap"><%== pagy_t('pagy.nav.gap') %></li>
+<%   elsif item.is_a?(String)  -%>    <li class="current"><%= item %></li>
+<%   elsif item == :gap        -%>    <li class="ellipsis gap" aria-hidden="true"></li>
 <%   end                       -%>
 <% end                         -%>
 <% if pagy.next                -%>    <li class="next"><%== link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next"') %></li>

data/lib/templates/nav_foundation.html.haml

@@ -22,13 +22,10 @@
 
       - elsif item.is_a?(String)                      # current page
         %li.current
-          %span.show-for-sr
-            != pagy_t('pagy.nav.current')
-          != item
+          = item
 
       - elsif item == :gap                            # page gap
-        %li.disabled.gap
-          != pagy_t('pagy.nav.gap')
+        %li.ellipsis.gap{"aria-hidden" => true}
 
     - if pagy.next
       %li.next!= link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next"')

data/lib/templates/nav_foundation.html.slim

@@ -22,13 +22,10 @@ nav.pagy-nav-foundation role="navigation" aria-label="Pagination"
 
       - elsif item.is_a?(String)                 # current page
         li.current
-          span.show-for-sr
-            == pagy_t('pagy.nav.current')
           = item
 
       - elsif item == :gap                       # page gap
-        li.disabled.gap
-          == pagy_t('pagy.nav.gap')
+        li.ellipsis.gap aria-hidden="true"
 
     - if pagy.next
       li.next == link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next"')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-29 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Agnostic pagination in plain ruby: it works with any framework, ORM
   and DB type, with all kinds of collections, even pre-paginated, scopes, Arrays,
@@ -23,8 +23,15 @@ files:
 - LICENSE.txt
 - lib/config/pagy.rb
 - lib/javascripts/pagy.js
-- lib/locales/pagy.yml
+- lib/locales/en.yml
+- lib/locales/es.yml
+- lib/locales/id.yml
+- lib/locales/ja.yml
 - lib/locales/plurals.rb
+- lib/locales/pt-br.yml
+- lib/locales/ru.yml
+- lib/locales/tr.yml
+- lib/locales/zh-cn.yml
 - lib/pagy.rb
 - lib/pagy/backend.rb
 - lib/pagy/extras/array.rb

data/lib/locales/pagy.yml

@@ -1,188 +0,0 @@
-# Standard pagy dictionary
-
-en:
-  pagy:
-    nav:
-      prev: "‹ Prev"
-      next: "Next ›"
-      gap: "…"
-      current: "You're on page"
-    info:
-      single_page:
-        zero: "No %{item_name} found"
-        one: "Displaying <b>1</b> %{item_name}"
-        other: "Displaying <b>all %{count}</b> %{item_name}"
-      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
-      item_name:
-        zero: "items"
-        one: "item"
-        other: "items"
-    compact:
-      page: "Page"
-      of: "of"
-    items:
-      show: "Show"
-      items: "items per page"
-es:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Prev"
-      next: "Siguiente&nbsp;&rsaquo;"
-      gap: "&hellip;"
-      current: "Estás en la página"
-    info:
-      single_page:
-        zero: "Sin resultados"
-        one: "Mostrando 1 %{item_name}"
-        other: "Mostrando %{count} %{item_name}"
-      multiple_pages: "Mostrando %{item_name} %{from}-%{to} de %{count} en total"
-      item_name:
-        zero: "ítems"
-        one: "ítem"
-        other: "ítems"
-    compact:
-      page: "Página"
-      of: "de"
-    items:
-      show: "Mostrar"
-      items: "ítems por página"
-id:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Balik"
-      next: "Lanjut&nbsp;&rsaquo;"
-      gap: "&hellip;"
-      current: "Anda di halaman"
-    info:
-      single_page:
-        zero: "Tidak ditemukan %{item_name}"
-        one: "Menampilkan <b>1</b> %{item_name}"
-        other: "Menampilkan <b>semua %{count}</b> %{item_name}"
-      multiple_pages: "Menampilkan %{item_name} <b>%{from}-%{to}</b> dari total <b>%{count}</b>"
-      item_name:
-        zero: "item"
-        one: "item"
-        other: "item"
-    compact:
-      page: "Halaman"
-      of: "dari"
-    items:
-      show: "Tampilkan"
-      items: "item per halaman"
-ja:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;前へ"
-      next: "次へ&nbsp;&rsaquo;"
-      gap: "&hellip;"
-    info:
-      single_page:
-        zero: "見つかりませんでした"
-        one: "<b>1</b> 件の%{item_name}"
-        other: "<b>%{count}</b> 件の%{item_name}"
-      multiple_pages: "<b>%{count}</b> 件中 <b>%{from}-%{to}</b> 件目の%{item_name}を表示中"
-      item_name:
-        zero: "結果"
-        one: "結果"
-        other: "結果"
-    compact:
-      page: "ページ"
-      of: "/"
-    items:
-      show: ""
-      items: "件ずつ表示"
-pt-br:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Anterior"
-      next: "Próximo&nbsp;&rsaquo;"
-      gap: "&hellip;"
-      current: "Está na página"
-    info:
-      single_page:
-        zero: "Sem resultados"
-        one: "Mostrando 1 %{item_name}"
-        other: "Mostrando %{count} %{item_name}"
-      multiple_pages: "Mostrando %{item_name} %{from}-%{to} no total de %{count}"
-      item_name:
-        zero: "itens"
-        one: "item"
-        other: "itens"
-    compact:
-      page: "Página"
-      of: "de"
-    items:
-      show: "Mostrar"
-      items: "itens por página"
-ru:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Назад"
-      next: "Вперёд&nbsp;&rsaquo;"
-      gap: "&hellip;"
-      current: "Вы на странице"
-    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}"
-      multiple_pages: "Всего <b>%{count}</b> %{item_name}, показаны с <b>%{from}</b> по <b>%{to}</b>"
-      item_name:
-        one: "запись"
-        few: "записи"
-        many: "записей"
-        other: "записей"
-    compact:
-      page: "Страница"
-      of: "из"
-    items:
-      show: "Показать"
-      items: "записей на странице"
-tr:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Önceki"
-      next: "Sonraki&nbsp;&rsaquo;"
-      gap: "&hellip;"
-    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:
-      page: "Sayfa"
-      of: "/"
-    items:
-      show: "Göster"
-      items: "sayfa başı"
-zh-cn:
-  pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;上一页"
-      next: "下一页&nbsp;&rsaquo;"
-      gap: "&hellip;"
-    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: "页面"
-      of: "/"
-    items:
-      show: "每页显示"
-      items: "条"
-
-# PR for other languages are very welcome. Thanks!