Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddnexus committed Apr 18, 2024
2 parents 60ae894 + a3c1ee3 commit d6d17cf
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body:
attributes:
label: 👀 Before submitting...
options:
- label: I upgraded to pagy version 8.2.1
- label: I upgraded to pagy version 8.2.2
required: true
- label: I searched through the [Documentation](https://ddnexus.github.io/pagy/)
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/latest_release_body.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +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.2.1
### Changes in 8.2.2

<!-- changes start -->
- Fix empty page param raising error (closes #689)
- Add nav translation for ko (closes #592) (#690)
<!-- changes end -->

[CHANGELOG](https://ddnexus.github.io/pagy/changelog)
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ If you upgrade from version `< 8.0.0` see the following:

<hr>

## Version 8.2.2

- Add nav translation for ko (closes #592) (#690)

## Version 8.2.1

- Fix empty page param raising error (closes #689)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ GEM
listen (~> 3.0)
rexml (3.2.6)
rouge (4.2.1)
rubocop (1.63.1)
rubocop (1.63.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down
2 changes: 1 addition & 1 deletion README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"cypress": "13.7.3",
"cypress": "13.8.0",
"cypress-html-validate": "6.1.0",
"eslint": "8.57.0",
"eslint-plugin-align-assignments": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion e2e/snapshots.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gem/apps/calendar.ru
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#4-calendar-app

VERSION = '8.2.1'
VERSION = '8.2.2'

require 'bundler/inline'
gemfile(true) do
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/demo.ru
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#3-demo-app

VERSION = '8.2.1'
VERSION = '8.2.2'

require 'bundler/inline'
gemfile(true) do
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/rails.ru
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#2-rails-app

VERSION = '8.2.1'
VERSION = '8.2.2'

# Gemfile
require 'bundler/inline'
Expand Down
2 changes: 1 addition & 1 deletion gem/apps/repro.ru
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# DOC
# https://ddnexus.github.io/pagy/playground/#1-repro-app

VERSION = '8.2.1'
VERSION = '8.2.2'

require 'bundler/inline'
gemfile(true) do
Expand Down
2 changes: 1 addition & 1 deletion gem/bin/pagy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

VERSION = '8.2.1'
VERSION = '8.2.2'
APPS = %w[repro rails demo calendar].freeze

require_relative '../lib/optimist'
Expand Down
2 changes: 1 addition & 1 deletion gem/config/pagy.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

# Pagy initializer file (8.2.1)
# Pagy initializer file (8.2.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

Expand Down
4 changes: 2 additions & 2 deletions gem/javascripts/pagy-dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gem/javascripts/pagy-module.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1",
version: "8.2.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;
Expand Down
2 changes: 1 addition & 1 deletion gem/javascripts/pagy.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gem/lib/pagy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Core class
class Pagy
VERSION = '8.2.1'
VERSION = '8.2.2'

# Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
def self.root
Expand Down
4 changes: 1 addition & 3 deletions gem/locales/ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
ko:
pagy:
aria_label:
# please add a comment in the https://github.com/ddnexus/pagy/issues/592
# posting the translation of the following "Page"/"Pages" with the plurals for this locale
nav: "Pages"
nav: "페이지"
prev: "이전"
next: "다음"
prev: "&lt;"
Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion retype.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ url: https://ddnexus.github.io/pagy

branding:
title: Pagy
label: 8.2.1
label: 8.2.2
colors:
label:
text: "#FFFFFF"
Expand Down
2 changes: 1 addition & 1 deletion src/pagy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Pagy = (() => {

// Public interface
return {
version: "8.2.1",
version: "8.2.2",

// Scan for elements with a "data-pagy" attribute and call their init functions with the decoded args
init(arg?:Element | never) {
Expand Down

0 comments on commit d6d17cf

Please sign in to comment.