pagy 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c03adb9b45ec8718cf2541a03bf7d24eeb4a50bd8ea904397f4414cf888a05
-  data.tar.gz: 23502a3be34f3251ffde3a6ad0e4fb3bf896ed87c9945fee5c19d52ee95b1c01
+  metadata.gz: e979c20b3707bfa08719b0fca92c4af61815ef525a9473e73ca2ae7e90fb1edf
+  data.tar.gz: 70fbef96ca45c915f18f47a5e37ecd6c42c2721a808c07c6c7b4c295cc35e501
 SHA512:
-  metadata.gz: e61129fb99a6eb80dad7e229b6e160d88b5ff44e64dca48b03e7419672df191f602fbd64a03ad600c05a282ce8b9fbced6a56526b092cf44e240e7b6fe5d1465
-  data.tar.gz: 451e59f3750d2eca6f704b0643f2c5afe84a56af504fee65e214d897ed5c81e0f38e04206086eb26acdab6db76d9f4c639698687c596508c67ce68f18e210477
+  metadata.gz: f46df19bef1296acd3288e2bcc73dcc6824866ea6abb2ccb31629a4e511baad027dfbba4433cb768291d0c6268221e4e2f3ae32012edb3c0f28c4cbd21798115
+  data.tar.gz: f2b696abd64a438b605304c142c6dd37f2c2a8039cbb002d8959712784a6d072073165df64485250067f0a8b1b6df6ba1efccd3c02459e5e954b0902b9246cb1

data/lib/config/pagy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-# Pagy initializer file (3.7.3)
+# Pagy initializer file (3.7.4)
 # 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/javascripts/pagy.js

@@ -2,7 +2,7 @@
 
 function Pagy(){}
 
-Pagy.version = '3.7.3';
+Pagy.version = '3.7.4';
 
 Pagy.init = function(arg){
               var target   = arg instanceof Event || arg === undefined ? document : arg,

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

@@ -1,6 +1,6 @@
 # :one_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
 
-pt-br:
+pt-BR:
   pagy:
 
     item_name:

data/lib/locales/sv-SE.yml

@@ -0,0 +1,23 @@
+# :one_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
+
+sv-SE:
+  pagy:
+
+    item_name:
+      one: "resultat"
+      two: "resultat"
+      other: "resultat"
+
+    nav:
+      prev: "‹ Föregående"
+      next: "Nästa ›"
+      gap: "…"
+
+    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: "Sida %{page_input} av %{pages}"
+
+    items_selector_js: "Visa %{items_input} %{item_name} per sida"

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

@@ -1,6 +1,6 @@
 # :one_two_other pluralization (see https://github.com/ddnexus/pagy/blob/master/lib/locales/utils/p11n.rb)
 
-se:
+sv:
   pagy:
 
     item_name:

data/lib/locales/utils/i18n.rb

@@ -4,15 +4,22 @@
 
 # this file returns the I18n hash used as default alternative to the i18n gem
 
-Hash.new{|h,_| h.first[1]}.tap do |i18n|   # first loaded locale used as default
-  i18n.define_singleton_method(:load) do |*args|
+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, *args)   #rubocop:disable Security/Eval
+    eval(Pagy.root.join('locales', 'utils', 'loader.rb').read).call(i18n_hash, *load_args)   #rubocop:disable Security/Eval
   end
-  i18n.define_singleton_method(:t) do |locale, path, vars={}|
+  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
     data, pluralize = self[locale]
     translate = data[path] || vars[:count] && data[path+=".#{pluralize.call(vars[:count])}"] or return %([translation missing: "#{path}"])
     translate.call(vars)
   end
-  i18n.load(locale: 'en')
+  i18n_hash.load(locale: 'en')
 end

data/lib/locales/utils/loader.rb

@@ -20,6 +20,11 @@ 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

@@ -60,14 +60,15 @@ 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['id'] = p11n[:other]
-  hash['fr'] = p11n[:one_upto_two_other]
-  hash['ja'] = p11n[:other]
-  hash['ko'] = p11n[:other]
-  hash['pl'] = p11n[:polish]
-  hash['ru'] = p11n[:east_slavic]
-  hash['se'] = p11n[:one_two_other]
-  hash['tr'] = p11n[:other]
+  hash['id']    = p11n[:other]
+  hash['fr']    = p11n[:one_upto_two_other]
+  hash['ja']    = p11n[:other]
+  hash['ko']    = p11n[:other]
+  hash['pl']    = p11n[:polish]
+  hash['ru']    = p11n[:east_slavic]
+  hash['sv']    = p11n[:one_two_other]
+  hash['sv-SE'] = p11n[:one_two_other]
+  hash['tr']    = p11n[:other]
   hash['zh-CN'] = p11n[:other]
   hash['zh-HK'] = p11n[:other]
   hash['zh-TW'] = p11n[:other]

data/lib/pagy.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-class Pagy ; VERSION = '3.7.3'
+class Pagy ; VERSION = '3.7.4'
 
   # Root pathname to get the path of Pagy files like templates or dictionaries
   def self.root; @root ||= Pathname.new(__FILE__).dirname.freeze end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagy
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-23 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,
@@ -36,9 +36,10 @@ files:
 - lib/locales/nb.yml
 - lib/locales/nl.yml
 - lib/locales/pl.yml
-- lib/locales/pt-br.yml
+- lib/locales/pt-BR.yml
 - lib/locales/ru.yml
-- lib/locales/se.yml
+- lib/locales/sv-SE.yml
+- lib/locales/sv.yml
 - lib/locales/tr.yml
 - lib/locales/utils/i18n.rb
 - lib/locales/utils/loader.rb