diff options
| author | Zog | 2018-04-03 12:02:56 +0200 |
|---|---|---|
| committer | Johan Van Ryseghem | 2018-04-03 12:03:12 +0200 |
| commit | b274526124fb5e2242ff482ab504a7ae59dd817b (patch) | |
| tree | d766002b8532242a8394ba996a5b07baec5d719c | |
| parent | 361ad6302d717acff9431d51126d8bf3a6143503 (diff) | |
| download | chouette-core-b274526124fb5e2242ff482ab504a7ae59dd817b.tar.bz2 | |
Refs #5972; Error messages more human-friendly
| -rw-r--r-- | app/models/chouette/stop_area.rb | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/stop_areas.fr.yml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index 5640c78b0..e22c3996d 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -90,7 +90,7 @@ module Chouette end unless self.stop_area_referential.validates_registration_number(self.registration_number) - errors.add(:registration_number, I18n.t('stop_areas.errors.registration_number.invalid')) + errors.add(:registration_number, I18n.t('stop_areas.errors.registration_number.invalid', mask: self.stop_area_referential.registration_number_format)) end end diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml index 4dbeda6a9..342fa3c68 100644 --- a/config/locales/stop_areas.en.yml +++ b/config/locales/stop_areas.en.yml @@ -8,7 +8,7 @@ en: registration_number: already_taken: Already taken cannot_be_empty: This field is mandatory - invalid: Incorrect value + invalid: "Incorrect value (expected value: \"%{mask}\")" default_geometry_success: "%{count} modified stop areas" stop_area: no_position: "No Position" diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml index 638011ad7..a532bdc40 100644 --- a/config/locales/stop_areas.fr.yml +++ b/config/locales/stop_areas.fr.yml @@ -9,7 +9,7 @@ fr: registration_number: already_taken: Déjà utilisé cannot_be_empty: Ce champ est requis - invalid: Valeur invalide + invalid: "Valeur invalide (valeur attendue: \"%{mask}\")" default_geometry_success: "%{count} arrêts édités" stop_area: no_position: "Pas de position" @@ -211,6 +211,6 @@ fr: hints: stop_area: registration_number: Laisser blanc pour assigner une valeur automatiquement. - + referential_stop_areas: <<: *fr_stop_areas |