diff --git a/app/components/editable_champ/rnf_component/rnf_component.en.yml b/app/components/editable_champ/rnf_component/rnf_component.en.yml index 24faeae48..5221ee0d0 100644 --- a/app/components/editable_champ/rnf_component/rnf_component.en.yml +++ b/app/components/editable_champ/rnf_component/rnf_component.en.yml @@ -2,4 +2,4 @@ en: rnf_info_error: No foundation found rnf_info_pending: RNF verification pending - rnf_info_success: "This RNF matches %{title}, %{address}" + rnf_info_success: "This RNF matches: %{title}, %{address}" diff --git a/app/components/editable_champ/rnf_component/rnf_component.fr.yml b/app/components/editable_champ/rnf_component/rnf_component.fr.yml index 6c1441985..0a334be79 100644 --- a/app/components/editable_champ/rnf_component/rnf_component.fr.yml +++ b/app/components/editable_champ/rnf_component/rnf_component.fr.yml @@ -2,4 +2,4 @@ fr: rnf_info_error: Aucune fondation trouvée rnf_info_pending: Vérification du RNF en cours - rnf_info_success: "Ce RNF correspond à %{title}, %{address}" + rnf_info_success: "Ce RNF correspond à : %{title}, %{address}" diff --git a/app/components/editable_champ/rnf_component/rnf_component.html.haml b/app/components/editable_champ/rnf_component/rnf_component.html.haml index c8685d8ca..ea5da960c 100644 --- a/app/components/editable_champ/rnf_component/rnf_component.html.haml +++ b/app/components/editable_champ/rnf_component/rnf_component.html.haml @@ -1,6 +1,6 @@ -= @form.text_field :external_id, input_opts(id: @champ.input_id, required: @champ.required?, class: "width-33-desktop fr-input small-margin", aria: { describedby: @champ.describedby_id }) += @form.text_field :external_id, input_opts(id: @champ.input_id, required: @champ.required?, class: "width-33-desktop fr-input", aria: { describedby: @champ.describedby_id }) -.rnf-info{ id: dom_id(@champ, :rnf_info) } +.rnf-info{ id: dom_id(@champ, :rnf_info), role: 'status' } - if @champ.fetch_external_data_error? %p.fr-error-text= t('.rnf_info_error') - elsif @champ.fetch_external_data_pending? diff --git a/app/views/shared/champs/rna/_association.html.haml b/app/views/shared/champs/rna/_association.html.haml index f0520db90..9fae5d37e 100644 --- a/app/views/shared/champs/rna/_association.html.haml +++ b/app/views/shared/champs/rna/_association.html.haml @@ -1,7 +1,6 @@ - case error - when :invalid - %p.fr-error-text - Le numéro RNA doit commencer par un W majuscule suivi de 9 chiffres ou lettres + %p.fr-error-text= t('.invalid_number') - when :not_found %p.fr-error-text= t('.not_found') - when :network_error diff --git a/config/locales/models/champs/rnf_champ/en.yml b/config/locales/models/champs/rnf_champ/en.yml index 8050acc4b..7b65475ef 100644 --- a/config/locales/models/champs/rnf_champ/en.yml +++ b/config/locales/models/champs/rnf_champ/en.yml @@ -18,4 +18,4 @@ en: attributes: champs/rnf_champ: hints: - value: "Expected format : 075-FDD-00003-01" + value_html: "Expected format: 075 hyphen FDD hyphen 00003 hyphen 01" diff --git a/config/locales/models/champs/rnf_champ/fr.yml b/config/locales/models/champs/rnf_champ/fr.yml index a847d6e52..7d95e7f71 100644 --- a/config/locales/models/champs/rnf_champ/fr.yml +++ b/config/locales/models/champs/rnf_champ/fr.yml @@ -18,4 +18,4 @@ fr: attributes: champs/rnf_champ: hints: - value: "Format attendu : 075-FDD-00003-01" + value_html: "Format attendu : 075 tiret FDD tiret 00003 tiret 01" diff --git a/config/locales/shared.en.yml b/config/locales/shared.en.yml index 044deec35..8f057684d 100644 --- a/config/locales/shared.en.yml +++ b/config/locales/shared.en.yml @@ -28,9 +28,10 @@ en: not_filled: not filled not_found: "RNA number %{rna} (no association found)" association: - data_fetched: "This RNA number is linked to %{title}, %{address}" + data_fetched: "This RNA number is linked to: %{title}, %{address}" not_found: "No association found" network_error: "A network error has prevented the association associated with this RNA to be fetched" + invalid_number: "The RNA number must begin with a capital W followed by 9 digits or letters" rnf: show: not_found: "RNF %{rnf} (no foundation found)" diff --git a/config/locales/shared.fr.yml b/config/locales/shared.fr.yml index fbca54f2d..968309730 100644 --- a/config/locales/shared.fr.yml +++ b/config/locales/shared.fr.yml @@ -30,9 +30,10 @@ fr: not_filled: non renseigné not_found: "RNA %{rna} (aucun établissement trouvé)" association: - data_fetched: "Ce RNA correspond à %{title}, %{address}" + data_fetched: "Ce RNA correspond à : %{title}, %{address}" not_found: "Aucun établissement trouvé" network_error: "Une erreur réseau a empêché l’association liée à ce RNA d’être trouvée" + invalid_number: "Le numéro RNA doit commencer par un W majuscule suivi de 9 chiffres ou lettres" rnf: show: not_found: "RNF %{rnf} (aucune fondation trouvée)"