Skip to content
Extraits de code Groupes Projets
Valider 2c0d756a rédigé par alpaca-tc's avatar alpaca-tc Validation de Eugen
Parcourir les fichiers

Extract error messages to locale file (#2162)

parent f06cba3f
Branches
Étiquettes
Aucune requête de fusion associée trouvée
...@@ -8,7 +8,7 @@ class Account < ApplicationRecord ...@@ -8,7 +8,7 @@ class Account < ApplicationRecord
# Local users # Local users
has_one :user, inverse_of: :account has_one :user, inverse_of: :account
validates :username, presence: true, format: { with: /\A[a-z0-9_]+\z/i, message: 'only letters, numbers and underscores' }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: 'local?' validates :username, presence: true, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: 'local?'
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
# Avatar upload # Avatar upload
......
...@@ -29,7 +29,7 @@ class Status < ApplicationRecord ...@@ -29,7 +29,7 @@ class Status < ApplicationRecord
validates :uri, uniqueness: true, unless: 'local?' validates :uri, uniqueness: true, unless: 'local?'
validates :text, presence: true, unless: 'reblog?' validates :text, presence: true, unless: 'reblog?'
validates_with StatusLengthValidator validates_with StatusLengthValidator
validates :reblog, uniqueness: { scope: :account, message: 'of status already exists' }, if: 'reblog?' validates :reblog, uniqueness: { scope: :account }, if: 'reblog?'
default_scope { order('id desc') } default_scope { order('id desc') }
......
en:
activerecord:
errors:
models:
account:
attributes:
username:
invalid: only letters, numbers and underscores
status:
attributes:
reblog:
taken: of status already exists
ja:
activerecord:
errors:
models:
account:
attributes:
username:
invalid: アルファベット・数値・アンダーバー(_)で入力してください
status:
attributes:
reblog:
taken: のブーストはすでに存在します
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter