Merge branch 'dev'

ddnexus · Apr 12, 2024 · d7e3110 · d7e3110
2 parents 3846645 + 30e2d26
commit d7e3110
Show file tree

Hide file tree

Showing 23 changed files with 134 additions and 123 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: 👀 Before submitting...
       options:
-        - label: I upgraded to pagy version 8.1.1
+        - label: I upgraded to pagy version 8.1.2
           required: true
         - label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
           required: true

diff --git a/.github/latest_release_body.md b/.github/latest_release_body.md
@@ -1,6 +1,6 @@
 ## ⚠ WARNING
 
-We may drop pagy's less used CSS extras.<br>
+We may drop pagy's less used CSS extras.  
 If you wish to keep your favorites alive, please, [vote here](https://github.com/ddnexus/pagy/discussions/categories/survey)
 
 ### ✴ What's new in 8.+ ✴
@@ -11,11 +11,10 @@ If you wish to keep your favorites alive, please, [vote here](https://github.com
 - Better frontend helpers
 - See the [CHANGELOG](https://ddnexus.github.io/pagy/changelog) for possible breaking changes
 
-### Changes in 8.1.1
+### Changes in 8.1.2
 
 <!-- changes start -->
-- Fixed broken aria-label for disabled links in Foundation (#685)
-- Simplification of input variables and defaults: params and request_path are not instance variables
+- Added "da" locale for aria_label.nav (closes #583)
 <!-- changes end -->
 
 [CHANGELOG](https://ddnexus.github.io/pagy/changelog)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,10 @@ If you upgrade from version `< 8.0.0` see the following:
 
 <hr>
 
+## Version 8.1.2
+
+- Added "da" locale for aria_label.nav (closes #583)
+
 ## Version 8.1.1
 
 - Fixed broken aria-label for disabled links in Foundation (#685)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
       listen (~> 3.0)
     rexml (3.2.6)
     rouge (4.2.1)
-    rubocop (1.63.0)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

diff --git a/README.md b/README.md
diff --git a/e2e/package.json b/e2e/package.json
@@ -8,9 +8,9 @@
     },
     "devDependencies": {
         "@cypress/snapshot": "^2.1.7",
-        "@types/node": "20.12.4",
-        "@typescript-eslint/eslint-plugin": "7.5.0",
-        "@typescript-eslint/parser": "7.5.0",
+        "@types/node": "20.12.7",
+        "@typescript-eslint/eslint-plugin": "7.6.0",
+        "@typescript-eslint/parser": "7.6.0",
         "cypress": "13.7.2",
         "cypress-html-validate": "6.1.0",
         "eslint": "8.57.0",
@@ -21,7 +21,7 @@
         "eslint-plugin-promise": "6.1.1",
         "html-validate": "8.18.1",
         "start-server-and-test": "2.0.3",
-        "typescript": "5.4.4"
+        "typescript": "5.4.5"
     },
     "scripts": {
         "lint-fix": "eslint --fix cypress --ext .ts",

diff --git a/gem/apps/calendar.ru b/gem/apps/calendar.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#4-calendar-app
 
-VERSION = '8.1.1'
+VERSION = '8.1.2'
 
 require 'bundler/inline'
 gemfile(true) do

diff --git a/gem/apps/demo.ru b/gem/apps/demo.ru
@@ -18,7 +18,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#3-demo-app
 
-VERSION = '8.1.1'
+VERSION = '8.1.2'
 
 require 'bundler/inline'
 gemfile(true) do

diff --git a/gem/apps/rails.ru b/gem/apps/rails.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#2-rails-app
 
-VERSION = '8.1.1'
+VERSION = '8.1.2'
 
 # Gemfile
 require 'bundler/inline'

diff --git a/gem/apps/repro.ru b/gem/apps/repro.ru
@@ -15,7 +15,7 @@
 # DOC
 #    https://ddnexus.github.io/pagy/playground/#1-repro-app
 
-VERSION = '8.1.1'
+VERSION = '8.1.2'
 
 require 'bundler/inline'
 gemfile(true) do

diff --git a/gem/bin/pagy b/gem/bin/pagy
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-VERSION = '8.1.1'
+VERSION = '8.1.2'
 APPS    = %w[repro rails demo calendar].freeze
 
 require_relative '../lib/optimist'

diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Pagy initializer file (8.1.1)
+# Pagy initializer file (8.1.2)
 # Customize only what you really need and notice that the core 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
 

diff --git a/gem/javascripts/pagy-dev.js b/gem/javascripts/pagy-dev.js
diff --git a/gem/javascripts/pagy-module.js b/gem/javascripts/pagy-module.js
@@ -81,7 +81,7 @@ const Pagy = (() => {
     const trim = (a, param) => a.replace(new RegExp(`[?&]${param}=1\\b(?!&)|\\b${param}=1&`), "");
     // Public interface
     return {
-        version: "8.1.1",
+        version: "8.1.2",
         // Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
         init(arg) {
             const target = arg instanceof Element ? arg : document;

diff --git a/gem/javascripts/pagy.js b/gem/javascripts/pagy.js
diff --git a/gem/lib/pagy.rb b/gem/lib/pagy.rb
@@ -5,7 +5,7 @@
 
 # Core class
 class Pagy
-  VERSION = '8.1.1'
+  VERSION = '8.1.2'
 
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root

diff --git a/gem/lib/pagy/calendar.rb b/gem/lib/pagy/calendar.rb
@@ -73,7 +73,7 @@ def page_at(time, **opts)
     def setup_unit_vars
       raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
       raise VariableError.new(self, :order, 'to be in [:asc, :desc]', @order) \
-            unless %i[asc desc].include?((@order = @vars[:order]))
+            unless %i[asc desc].include?(@order = @vars[:order])
 
       @starting, @ending = @vars[:period]
       raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \

diff --git a/gem/locales/da.yml b/gem/locales/da.yml
@@ -2,11 +2,9 @@
 da:
   pagy:
     aria_label:
-      # please add a comment in the https://github.com/ddnexus/pagy/issues/583
-      # posting the translation of the following  "Page"/"Pages" with the plurals for this locale
-      nav: "Pages"
-#        one: ""
-#        other: ""
+      nav:
+        one: "Side"
+        other: "Sider"
       prev: "Forrige"
       next: "Næste"
     prev: "&lt;"

diff --git a/playground.md b/playground.md
@@ -13,7 +13,7 @@ $ pagy --help
 ```
 
 !!!warning `bundle exec pagy`
-Depending on your environment you may need to prepend `bundle exec` in all the examples shown in this page
+Depending on your environment you may need to prepend `bundle exec` in all the examples shown.
 !!!
 
 ### Pagy Apps
@@ -49,7 +49,12 @@ Edit it at will.
 
 #### 2. Rails App
 
-Starting point app to reproduce **rails related** pagy issues. Same usage as the [Repro App](#1-repro-app).
+Starting point app to reproduce **rails related** pagy issues. It has the same usage as the [Repro App](#1-repro-app). i.e.:
+
+```sh
+pagy clone rails
+pagy ./rails.ru
+```
 
 #### 3. Demo App