diff options
| author | alpaca-tc <alpaca-tc@alpaca.tc> | 2017-04-20 05:19:32 +0900 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-19 22:19:32 +0200 |
| commit | 2c0d756ad942ee19c4f6dd18c9769b6649c2d15f (patch) | |
| tree | 852f2ace7966f0048258c795581b3ca05ac0c6a0 | |
| parent | f06cba3f601faed1db40200eca5c9ad88b704dcb (diff) | |
Extract error messages to locale file (#2162)
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | config/activerecord.en.yml | 12 | ||||
| -rw-r--r-- | config/activerecord.ja.yml | 12 |
4 files changed, 26 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 9b4f7e2ca..b497a90a3 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -8,7 +8,7 @@ class Account < ApplicationRecord # Local users 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?' # Avatar upload diff --git a/app/models/status.rb b/app/models/status.rb index 2d27a57d5..b75bd0a7b 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -29,7 +29,7 @@ class Status < ApplicationRecord validates :uri, uniqueness: true, unless: 'local?' validates :text, presence: true, unless: 'reblog?' 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') } diff --git a/config/activerecord.en.yml b/config/activerecord.en.yml new file mode 100644 index 000000000..c3354fa25 --- /dev/null +++ b/config/activerecord.en.yml @@ -0,0 +1,12 @@ +en: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: only letters, numbers and underscores + status: + attributes: + reblog: + taken: of status already exists diff --git a/config/activerecord.ja.yml b/config/activerecord.ja.yml new file mode 100644 index 000000000..6e6b48496 --- /dev/null +++ b/config/activerecord.ja.yml @@ -0,0 +1,12 @@ +ja: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: アルファベット・数値・アンダーバー(_)で入力してください + status: + attributes: + reblog: + taken: のブーストはすでに存在します |