Merge branch 'master' into translations_en-yml--master_de_DE

This commit is contained in:
Jesus Federico 2019-05-07 14:25:05 -04:00 committed by GitHub
commit 4fc5b26fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions

View File

@ -143,4 +143,4 @@ Pagy::VARS[:items] = Rails.configuration.pagination_rows # default
# I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory
# than the default pagy internal i18n (see above)
# See https://ddnexus.github.io/pagy/extras/i18n
# require 'pagy/extras/i18n'
require 'pagy/extras/i18n'

View File

@ -90,6 +90,12 @@ en:
version: We've released a new version of Greenlight, but your database isn't compatible.
messages:
blank: can't be blank
too_short: is too short
invalid: is invalid
taken: has already been taken
accepted: must be accepted
confirmation: doesn't match %{attribute}
inclusion: is not included in the list
not_found:
message: Whoops! Looks like we can't find that.
help: Is it possible its been removed?
@ -202,6 +208,11 @@ en:
name_update_success: Room name successfully changed!
no_user_email_exists: There is no existing user with the email specified. Please make sure you typed it correctly.
omniauth_error: An error occured while authenticating with omniauth. Please try again or contact an administrator!
pagy:
nav:
prev: "‹ Prev"
next: "Next ›"
gap: "…"
password: Password
password_empty_notice: Password cannot be empty.
password_reset_success: Password has been reset.