pagy 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12b109cdfa036177939e12f0252a8f80d8ff7212dda373285cbc617dd560354
-  data.tar.gz: 43678554d764fa960ebae93ceee27adda79b35b304c4c6d90b1f2ac9e03406bb
+  metadata.gz: b070d610f896a8b61e0f100c733e83d8eed0bfce6976ff24ed6e533f329c1ad2
+  data.tar.gz: 6c3654d072aea0dede29f6bf15069cc82ee3d6869ef812db6b78b0dda401013d
 SHA512:
-  metadata.gz: 750e5d774204787364b1e8a658c721e4a3a19349f50c06e6764fdb436550513128b5ab22f438a01c46576476f404b0953188c42345dc0c898ce025217acd76aa
-  data.tar.gz: 16f9efe431559d358efe7532c896dafeedac33b468b18259f72a430258892d13cf313d864bd2a2bb38585b6eb2782d5655b05c67403b41e0e1475235adf3cf59
+  metadata.gz: c4172ff22491bc6506fe9041e71ef6e7abf92c3bee1dbf17f7f067e7a25fd9fa0124f3e5c54dbf30807f2d3df9b49fc432d8683cc8fde0d8434aa4c1686823a6
+  data.tar.gz: 87f78b815480fa7bd1392b4b2991d4af65783acf55ada2dea2724546a1b7c2e0e046e0c5ea838b6c200c8a655d3850f1db9360ae7ee514419e667980759d61f4

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (v2.1.4)
+# Pagy initializer file (2.1.5)
 # Customize only what you really need and notice that Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 

data/lib/locales/README.md

@@ -6,10 +6,10 @@ If you are using pagy with some language missing from the dictionary files, plea
 
 The `pagy.info.single_page`, `pagy.info.item_name` and `pagy.items` keys of the yaml file are pluralized according to the plural rules of the language.
 
-If you are going to submit a dictionary, please check wether the pluralization type of your language exists in the [plurals.rb](https://github.com/ddnexus/pagy/blob/master/lib/locales/plurals.rb) file. If it is missing, please, report it. Thanks.
+If you are going to submit a dictionary, please check wether the pluralization type of your language exists in the [lib/locales/utils/p11n.rb](utils/p11n.rb) file. If it is missing, please, report it. Thanks.
 
 ### Useful Links
 
 * [Pagy I18n Documentation](https://ddnexus.github.io/pagy/api/frontend#i18n)
-* [i18n extra](https://ddnexus.github.io/pagy/extra/i18n)
+* [I18n Extra](https://ddnexus.github.io/pagy/extras/i18n)
 

data/lib/locales/utils/loader.rb

@@ -16,10 +16,17 @@ 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]]
     hash = YAML.load(File.read(arg[:filepath], encoding: 'UTF-8')) #rubocop:disable Security/YAMLLoad

data/lib/locales/{zh-cn.yml → zh-CN.yml}

@@ -1,4 +1,4 @@
-zh-cn:
+zh-CN:
   pagy:
     nav:
       prev: "‹ 上一页"

data/lib/locales/{zh-hk.yml → zh-HK.yml}

@@ -1,4 +1,4 @@
-zh-hk:
+zh-HK:
   pagy:
     nav:
       prev: "‹ 上一頁"
@@ -17,4 +17,4 @@ zh-hk:
     compact: "第 %{page_input} / %{pages} 頁"
     items:
       one: "每頁顯示 %{items_input} 記錄"
-      other: "每頁顯示 %{items_input} 記錄"
+      other: "每頁顯示 %{items_input} 記錄"

data/lib/locales/zh-TW.yml

@@ -0,0 +1,20 @@
+zh-TW:
+  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/extras/items.rb

@@ -38,9 +38,10 @@ class Pagy
   module Frontend
 
     alias_method :pagy_url_for_without_items, :pagy_url_for
-    def pagy_url_for_with_items(page, pagy)
-      p_vars = pagy.vars; params = request.GET.merge(p_vars[:page_param] => page, p_vars[:items_param] => p_vars[:items]).merge!(p_vars[:params])
-      "#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
+    def pagy_url_for_with_items(page, pagy, url=false)
+      p_vars = pagy.vars; params = request.GET.merge(p_vars[:params]); params[p_vars[:page_param].to_s] = page
+      params[p_vars[:items_param].to_s] = p_vars[:items]
+      "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
     end
     alias_method :pagy_url_for, :pagy_url_for_with_items
 

data/lib/pagy/frontend.rb

@@ -12,9 +12,9 @@ class Pagy
 
   module Helpers
     # This works with all Rack-based frameworks (Sinatra, Padrino, Rails, ...)
-    def pagy_url_for(page, pagy, path_or_url=:path)
+    def pagy_url_for(page, pagy, url=false)
       p_vars = pagy.vars; params = request.GET.merge(p_vars[:params]); params[p_vars[:page_param].to_s] = page
-      "#{request.send(path_or_url)}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
+      "#{request.base_url if url}#{request.path}?#{Rack::Utils.build_nested_query(pagy_get_params(params))}#{p_vars[:anchor]}"
     end
 
     # Sub-method called only by #pagy_url_for: here for easy customization of params by overriding

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '2.1.4'
+class Pagy ; VERSION = '2.1.5'
 
   class OverflowError < StandardError; attr_reader :pagy; def initialize(pagy) @pagy = pagy end; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-29 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,
@@ -37,8 +37,9 @@ files:
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb
 - lib/locales/utils/p11n.rb
-- lib/locales/zh-cn.yml
-- lib/locales/zh-hk.yml
+- lib/locales/zh-CN.yml
+- lib/locales/zh-HK.yml
+- lib/locales/zh-TW.yml
 - lib/pagy.rb
 - lib/pagy/backend.rb
 - lib/pagy/countless.rb