models: improve error message for invalid champs

Avoid prepending the message with 'Draft revision '

app/validators/siret_format_validator.rb

@@ -1,7 +1,7 @@
 class SiretFormatValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if !format_is_valid(value)
-      record.errors.add(attribute, :format)
+      record.errors.add(attribute, :length)
     end
 
     if !luhn_passed(value)

config/application.rb

@@ -51,6 +51,9 @@ module TPS
     # Set the queue name for the mail delivery jobs to 'mailers'
     config.action_mailer.deliver_later_queue_name = :mailers
 
+    # Allow the error messages format to be customized
+    config.active_model.i18n_customize_full_message = true
+
     # Set the queue name for the analysis jobs to 'active_storage_analysis'
     config.active_storage.queues.analysis = :active_storage_analysis
 

config/locales/models/procedure/fr.yml

@@ -23,4 +23,5 @@ fr:
           attributes:
             api_particulier_token:
               invalid: 'n’a pas le bon format'
-
+            draft_revision:
+              format: '%{message}'

config/locales/models/siret/fr.yml

@@ -10,6 +10,6 @@ fr:
         siret:
           attributes:
             siret:
-              format: 'Le numéro SIRET doit comporter 14 chiffres'
+              length: 'Le numéro SIRET doit comporter 14 chiffres'
               checksum: 'Le numéro SIRET comporte une erreur, vérifiez les chiffres composant le numéro'
               invalid: 'Le numéro SIRET ne correspond pas à un établissement existant'

spec/models/procedure_spec.rb

@@ -297,21 +297,21 @@ describe Procedure do
 
         it 'validates that no repetition type de champ is empty' do
           procedure.validate
-          expect(procedure.errors[:draft_revision]).to include(invalid_repetition_error_message)
+          expect(procedure.errors.full_messages_for(:draft_revision)).to include(invalid_repetition_error_message)
 
           text_field.revision = repetition.revision
           text_field.order_place = repetition.types_de_champ.size
           procedure.draft_revision.types_de_champ.find(&:repetition?).types_de_champ << text_field
 
           procedure.validate
-          expect(procedure.errors[:draft_revision]).not_to include(invalid_repetition_error_message)
+          expect(procedure.errors.full_messages_for(:draft_revision)).not_to include(invalid_repetition_error_message)
         end
       end
 
       context 'when validating for publication' do
         it 'validates that no repetition type de champ is empty' do
           procedure.validate(:publication)
-          expect(procedure.errors[:draft_revision]).to include(invalid_repetition_error_message)
+          expect(procedure.errors.full_messages_for(:draft_revision)).to include(invalid_repetition_error_message)
         end
       end
     end