Pagination improvements (#1445)
* Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views
This commit is contained in:
parent
a283786463
commit
4ada50985a
36 changed files with 77 additions and 65 deletions
|
@ -33,7 +33,7 @@ search:
|
|||
|
||||
ignore_unused:
|
||||
- 'activerecord.attributes.*'
|
||||
- '{devise,will_paginate,doorkeeper}.*'
|
||||
- '{devise,pagination,doorkeeper}.*'
|
||||
- '{datetime,time}.*'
|
||||
- 'simple_form.{yes,no}'
|
||||
- 'simple_form.{placeholders,hints,labels}.*'
|
||||
|
|
7
config/initializers/kaminari_config.rb
Normal file
7
config/initializers/kaminari_config.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
Kaminari.configure do |config|
|
||||
config.default_per_page = 40
|
||||
config.window = 1
|
||||
config.left = 3
|
||||
config.right = 1
|
||||
end
|
0
config/initializers/pagination.rb
Normal file
0
config/initializers/pagination.rb
Normal file
|
@ -88,5 +88,3 @@ de:
|
|||
default: "%d.%m.%Y %H:%M"
|
||||
users:
|
||||
invalid_email: Inkorrekte E-mail-Addresse
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -126,6 +126,7 @@ en:
|
|||
pagination:
|
||||
next: Next
|
||||
prev: Prev
|
||||
truncate: "…"
|
||||
remote_follow:
|
||||
acct: Enter your username@domain you want to follow from
|
||||
missing_resource: Could not find the required redirect URL for your account
|
||||
|
@ -169,5 +170,3 @@ en:
|
|||
users:
|
||||
invalid_email: The e-mail address is invalid
|
||||
invalid_otp_token: Invalid two-factor code
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -160,5 +160,3 @@ eo:
|
|||
users:
|
||||
invalid_email: La retpoŝt-adreso ne estas valida
|
||||
invalid_otp_token: La dufaktora aŭtentigila kodo ne estas valida
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -51,5 +51,3 @@ es:
|
|||
settings:
|
||||
edit_profile: Editar perfil
|
||||
preferences: Preferencias
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -160,5 +160,3 @@ fi:
|
|||
users:
|
||||
invalid_email: Virheellinen sähköposti
|
||||
invalid_otp_token: Virheellinen kaksivaihe tunnistus koodi
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -167,5 +167,3 @@ fr:
|
|||
users:
|
||||
invalid_email: L'adresse courriel est invalide
|
||||
invalid_otp_token: Le code d'authentification à deux facteurs est invalide
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -51,5 +51,3 @@ hu:
|
|||
settings:
|
||||
edit_profile: Profil szerkesztése
|
||||
preferences: Beállítások
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -160,5 +160,3 @@
|
|||
users:
|
||||
invalid_email: E-post addressen er ugyldig
|
||||
invalid_otp_token: Ugyldig two-faktor kode
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -51,5 +51,3 @@ pt:
|
|||
settings:
|
||||
edit_profile: Editar perfil
|
||||
preferences: Preferências
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -161,5 +161,3 @@ ru:
|
|||
users:
|
||||
invalid_email: Введенный e-mail неверен
|
||||
invalid_otp_token: Введен неверный код
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -51,5 +51,3 @@ uk:
|
|||
settings:
|
||||
edit_profile: Редагувати профіль
|
||||
preferences: Налаштування
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
|
@ -150,5 +150,3 @@ zh-CN:
|
|||
users:
|
||||
invalid_email: 无效的邮箱
|
||||
invalid_otp_token: 无效的两步验证码
|
||||
will_paginate:
|
||||
page_gap: "…"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue