From 2f0953692c6bcb92f2487d56f9e67bcfeb2a1fec Mon Sep 17 00:00:00 2001 From: Judith Date: Tue, 25 Aug 2020 15:01:54 +0200 Subject: [PATCH 1/2] Internationalization of the Contact page in FR and EN --- app/controllers/support_controller.rb | 4 +- app/lib/helpscout/form_adapter.rb | 48 +-- app/views/layouts/_account_dropdown.haml | 12 +- app/views/support/index.html.haml | 78 ++--- config/locales/en.yml | 306 +++++++++++++++++- config/locales/fr.yml | 13 +- .../views/layouts/_account_dropdown.en.yml | 8 + .../views/layouts/_account_dropdown.fr.yml | 8 + config/locales/views/support/index.en.yml | 32 ++ config/locales/views/support/index.fr.yml | 31 ++ 10 files changed, 446 insertions(+), 94 deletions(-) create mode 100644 config/locales/views/layouts/_account_dropdown.en.yml create mode 100644 config/locales/views/layouts/_account_dropdown.fr.yml create mode 100644 config/locales/views/support/index.en.yml create mode 100644 config/locales/views/support/index.fr.yml diff --git a/app/controllers/support_controller.rb b/app/controllers/support_controller.rb index 4ab449b72..a83b5e438 100644 --- a/app/controllers/support_controller.rb +++ b/app/controllers/support_controller.rb @@ -38,12 +38,12 @@ class SupportController < ApplicationController def setup_context @dossier_id = dossier&.id @tags = tags - @options = Helpscout::FormAdapter::OPTIONS + @options = Helpscout::FormAdapter.options end def setup_context_admin @tags = tags - @options = Helpscout::FormAdapter::ADMIN_OPTIONS + @options = Helpscout::FormAdapter.admin_options end def create_conversation diff --git a/app/lib/helpscout/form_adapter.rb b/app/lib/helpscout/form_adapter.rb index c304e2014..d9aaea738 100644 --- a/app/lib/helpscout/form_adapter.rb +++ b/app/lib/helpscout/form_adapter.rb @@ -1,24 +1,37 @@ class Helpscout::FormAdapter attr_reader :params + def self.options + [ + [I18n.t(TYPE_INFO, scope: [:support, :question]), TYPE_INFO], + [I18n.t(TYPE_PERDU, scope: [:support, :question]), TYPE_PERDU], + [I18n.t(TYPE_INSTRUCTION, scope: [:support, :question]), TYPE_INSTRUCTION], + [I18n.t(TYPE_AMELIORATION, scope: [:support, :question]), TYPE_AMELIORATION], + [I18n.t(TYPE_AUTRE, scope: [:support, :question]), TYPE_AUTRE] + ] + end + + def self.admin_options + [ + [I18n.t(ADMIN_TYPE_QUESTION, scope: [:supportadmin]), ADMIN_TYPE_QUESTION], + [I18n.t(ADMIN_TYPE_RDV, scope: [:supportadmin]), ADMIN_TYPE_RDV], + [I18n.t(ADMIN_TYPE_SOUCIS, scope: [:supportadmin]), ADMIN_TYPE_SOUCIS], + [I18n.t(ADMIN_TYPE_PRODUIT, scope: [:supportadmin]), ADMIN_TYPE_PRODUIT], + [I18n.t(ADMIN_TYPE_DEMANDE_COMPTE, scope: [:supportadmin]), ADMIN_TYPE_DEMANDE_COMPTE], + [I18n.t(ADMIN_TYPE_AUTRE, scope: [:supportadmin]), ADMIN_TYPE_AUTRE] + ] + end + def initialize(params = {}, api = nil) @params = params @api = api || Helpscout::API.new end - TYPE_INFO = 'info demarche' - TYPE_PERDU = 'usager perdu' - TYPE_INSTRUCTION = 'info instruction' - TYPE_AMELIORATION = 'produit' - TYPE_AUTRE = 'autre' - - OPTIONS = [ - [I18n.t(TYPE_INFO, scope: [:support]), TYPE_INFO], - [I18n.t(TYPE_PERDU, scope: [:support]), TYPE_PERDU], - [I18n.t(TYPE_INSTRUCTION, scope: [:support]), TYPE_INSTRUCTION], - [I18n.t(TYPE_AMELIORATION, scope: [:support]), TYPE_AMELIORATION], - [I18n.t(TYPE_AUTRE, scope: [:support]), TYPE_AUTRE] - ] + TYPE_INFO = 'procedure_info' + TYPE_PERDU = 'lost_user' + TYPE_INSTRUCTION = 'instruction_info' + TYPE_AMELIORATION = 'product' + TYPE_AUTRE = 'other' ADMIN_TYPE_RDV = 'admin demande rdv' ADMIN_TYPE_QUESTION = 'admin question' @@ -27,15 +40,6 @@ class Helpscout::FormAdapter ADMIN_TYPE_DEMANDE_COMPTE = 'admin demande compte' ADMIN_TYPE_AUTRE = 'admin autre' - ADMIN_OPTIONS = [ - [I18n.t(ADMIN_TYPE_QUESTION, scope: [:supportadmin]), ADMIN_TYPE_QUESTION], - [I18n.t(ADMIN_TYPE_RDV, scope: [:supportadmin]), ADMIN_TYPE_RDV], - [I18n.t(ADMIN_TYPE_SOUCIS, scope: [:supportadmin]), ADMIN_TYPE_SOUCIS], - [I18n.t(ADMIN_TYPE_PRODUIT, scope: [:supportadmin]), ADMIN_TYPE_PRODUIT], - [I18n.t(ADMIN_TYPE_DEMANDE_COMPTE, scope: [:supportadmin]), ADMIN_TYPE_DEMANDE_COMPTE], - [I18n.t(ADMIN_TYPE_AUTRE, scope: [:supportadmin]), ADMIN_TYPE_AUTRE] - ] - def send_form conversation_id = create_conversation diff --git a/app/views/layouts/_account_dropdown.haml b/app/views/layouts/_account_dropdown.haml index e826f372c..892a44e0e 100644 --- a/app/views/layouts/_account_dropdown.haml +++ b/app/views/layouts/_account_dropdown.haml @@ -10,29 +10,29 @@ %li = link_to manager_root_path, class: "menu-item menu-link" do = image_tag "icons/super-admin.svg", alt: '' - Passer en super-admin + = t('go_superadmin', scope: [:layouts]) - if multiple_devise_profile_connect? - if user_signed_in? && nav_bar_profile != :user %li = link_to dossiers_path, class: "menu-item menu-link" do = image_tag "icons/switch-profile.svg", alt: '' - Passer en usager + = t('go_user', scope: [:layouts]) - if instructeur_signed_in? && nav_bar_profile != :instructeur %li = link_to instructeur_procedures_path, class: "menu-item menu-link" do = image_tag "icons/switch-profile.svg", alt: '' - Passer en instructeur + = t('go_instructor', scope: [:layouts]) - if administrateur_signed_in? && nav_bar_profile != :administrateur %li = link_to admin_procedures_path, class: "menu-item menu-link" do = image_tag "icons/switch-profile.svg", alt: '' - Passer en administrateur + = t('go_admin', scope: [:layouts]) %li = link_to profil_path, class: "menu-item menu-link" do = image_tag "icons/switch-profile.svg", alt: '' - Voir mon profil + = t('profile', scope: [:layouts]) %li = link_to destroy_user_session_path, method: :delete, class: "menu-item menu-link" do = image_tag "icons/sign-out.svg", alt: '' - Se déconnecter + = t('logout', scope: [:layouts]) diff --git a/app/views/support/index.html.haml b/app/views/support/index.html.haml index 94299428c..28729416f 100644 --- a/app/views/support/index.html.haml +++ b/app/views/support/index.html.haml @@ -4,19 +4,15 @@ #contact-form .container - %h1.new-h1 Contact + %h1.new-h1 + = t('contact', scope: [:support]) = form_tag contact_path, method: :post, multipart: true, class: 'form' do |f| .description - %p - Contactez-nous via ce formulaire et nous vous répondrons dans les plus brefs délais. - Pensez bien à nous donner le plus d'informations possible pour que nous puissions vous aider au mieux. + %p= t('intro_html', scope: [:support]) %br - %p.mandatory-explanation - Les champs suivis d’un astérisque ( - %span.mandatory * - ) sont obligatoires. + %p.mandatory-explanation= t('asterisk_html', scope: [:utils]) - if !user_signed_in? .contact-champ @@ -27,88 +23,60 @@ .contact-champ = label_tag :type do - Votre question + = t('your_question', scope: [:support, :question]) %span.mandatory * - = select_tag :type, options_for_select(@options, params[:type]), include_blank: "Choisir une question", required: true + = select_tag :type, options_for_select(@options, params[:type]), include_blank: t('choose_question', scope: [:support, :question]), required: true .support.card.featured.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_INFO } } .card-title - 👉 Notre réponse + = t('our_answer', scope: [:support, :response]) .card-content - %p - Avez-vous bien vérifié que tous les champs obligatoires ( - %span.mandatory * - ) sont bien remplis ? - %p Si vous avez des questions sur les informations à saisir, contactez les services en charge de la démarche. - %p - %a{ href: FAQ_CONTACTER_SERVICE_EN_CHARGE_URL } - En savoir plus + = t('procedure_info_html', scope: [:support, :response], link_procedure_info: FAQ_CONTACTER_SERVICE_EN_CHARGE_URL) .support.card.featured.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_PERDU } } .card-title - 👉 Notre réponse + = t('our_answer', scope: [:support, :response]) .card-content - %p Nous vous invitons à contacter l’administration en charge de votre démarche pour qu’elle vous indique le lien à suivre. Celui-ci devrait ressembler à cela : #{APPLICATION_BASE_URL}/commencer/NOM_DE_LA_DEMARCHE . - %br - %p Vous pouvez aussi consulter ici la liste de nos démarches les plus frequentes (permis, detr etc) : - %p - %a{ href: LISTE_DES_DEMARCHES_URL } - = LISTE_DES_DEMARCHES_URL + = t('lost_user_html', scope: [:support, :response], base_url: APPLICATION_BASE_URL, link_lost_user: LISTE_DES_DEMARCHES_URL) .support.card.featured.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_INSTRUCTION } } .card-title - 👉 Notre réponse - %p Si vous avez des questions sur l’instruction de votre dossier (par exemple sur les délais), nous vous invitons à contacter directement les services qui instruisent votre dossier par votre messagerie. - %p - %a{ href: FAQ_OU_EN_EST_MON_DOSSIER_URL } - En savoir plus - %br - %p Si vous souhaitez poser une question pour un problème technique sur le site, utilisez le formulaire ci-dessous. Nous ne pourrons pas vous renseigner sur l'instruction de votre dossier. + = t('our_answer', scope: [:support, :response]) + .card-content + = t('instruction_info_html', scope: [:support, :response], link_instruction: FAQ_OU_EN_EST_MON_DOSSIER_URL) .support.card.featured.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_AMELIORATION } } .card-title - 👉 Notre réponse - %p - Une idée ? Pensez à consulter notre - = succeed ' !' do - %strong - tableau de bord des améliorations - %p - %ul - %li • Votez pour vos améliorations prioritaires ; - %li • Proposez votre propre idée. - - %p - %strong - %a{ href: FEATURE_UPVOTE_URL } - ➡ Accéder au tableau des améliorations + = t('our_answer', scope: [:support, :response]) + .card-content + = t('product_html', scope: [:support, :response], link_product: FEATURE_UPVOTE_URL) .contact-champ - = label_tag :dossier_id, 'Numéro du dossier concerné' + = label_tag :dossier_id, t('file_number', scope: [:utils]) = text_field_tag :dossier_id, @dossier_id .contact-champ = label_tag :subject do - Sujet + = t('subject', scope: [:utils]) %span.mandatory * = text_field_tag :subject, params[:subject], required: true .contact-champ = label_tag :text do - Message + = t('message', scope: [:utils]) %span.mandatory * = text_area_tag :text, params[:text], rows: 6, required: true .contact-champ = label_tag :piece_jointe do - Pièce jointe + = t('pj', scope: [:utils]) %p.notice.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_AMELIORATION } } - Une capture d’écran peut nous aider à identifier plus facilement l’endroit à améliorer. + = t('notice_pj_product', scope: [:support, :response]) %p.notice.hidden{ data: { 'contact-type-only': Helpscout::FormAdapter::TYPE_AUTRE } } - Une capture d’écran peut nous aider à identifier plus facilement le problème. + = t('notice_pj_other', scope: [:support, :response]) = file_field_tag :piece_jointe = hidden_field_tag :tags, @tags&.join(',') .send-wrapper - = button_tag 'Envoyer le message', type: :submit, class: 'button send primary' + = button_tag t('send_mail', scope: [:utils]), type: :submit, class: 'button send primary' diff --git a/config/locales/en.yml b/config/locales/en.yml index 8ac1da0bb..5f53e265d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,8 +22,310 @@ en: hello: "Hello world" utils: - deconnexion: "Logout" + deconnexion: "Log out" involved: "See concerned people" no-commentaires: "There is no message yet, feel free to start the first one." depositaire: "Dépositaire" - pieces: "Pièces jointes" + pj: "Attachments" + asterisk_html: Fields marked by an asterisk ( * ) are mandatory. + file_number: File number + subject: Subject + message: Message + send_mail: Send message + views: + pagination: + next: Next + last: Last + previous: Previous + first: First + truncate: '…' + + # mail: + # administration: + # dossier_expiration_summary: + # expired_dossiers: + # one: "Un dossier a passé sa date limite de conservation" + # other: "%{count} dossiers ont passé leur date limite de conservation" + # expiring_dossiers: + # one: "Un dossier est sur le point de passer sa date limite de conservation" + # other: "%{count} dossiers sont sur le point de passer leur date limite de conservation" + + modal: + publish: + title: + publish: Publish the procedure + reopen: Reopen the procedure + body: + publish: You are about to publish the procedure to the public. + reopen: You are about to reopen the procedure. + submit: + publish: Publish + reopen: Reopen + supportadmin: + # admin demande rdv: Demande de RDV pour une présentation à distance de demarches-simplifiees.fr + admin question: I have a question about demarches-simplifiees.fr + admin soucis: I have a technical issue on demarches-simplifiees.fr + admin suggestion produit: I have a suggestion for an evolution + admin demande compte: I wish to open an admin account with an Orange, Wanadoo, etc. email + admin autre: Other topic + + number: + currency: + format: + delimiter: " " + format: "%n %u" + precision: 2 + separator: "," + significant: false + strip_insignificant_zeros: false + unit: "€" + format: + delimiter: " " + precision: 3 + separator: "," + significant: false + strip_insignificant_zeros: false + human: + decimal_units: + format: "%n %u" + units: + billion: billion + million: million + quadrillion: quadrillion + thousand: thousand + trillion: trillion + unit: '' + format: + delimiter: '' + precision: 3 + significant: true + strip_insignificant_zeros: true + storage_units: + format: "%n %u" + units: + byte: + one: byte + other: bytes + gb: Gb + kb: kb + mb: Mb + tb: Tb + percentage: + format: + delimiter: '' + format: "%n%" + precision: + format: + delimiter: '' + activerecord: + attributes: + user: + siret: 'Numéro SIRET' + password: 'password' + instructeur: + password: 'password' + errors: + messages: + blank: "must be filled" + not_a_number: 'must be a number' + not_an_integer: 'must be an integer (without digit after the comma)' + greater_than: "must be greater than %{count}" + greater_than_or_equal_to: "must be greater than or equal to %{count}" + less_than: "must be less than %{count}" + less_than_or_equal_to: "must be less than or equal to %{count}" + models: + attestation_template: + attributes: + footer: + too_long: ": the footer is too long." + user: + attributes: + reset_password_token: + # invalid: ": Votre lien de nouveau mot de passe a expiré. Merci d’en demander un nouveau." + email: + invalid: invalid + taken: already in use + password: + too_short: 'is too short' + password_confirmation: + confirmation: ': The two passwords do not match' + invite: + attributes: + email: + taken: ': Invitation already sent' + instructeur: + attributes: + email: + invalid: invalid + taken: already in use + password: + too_short: 'is too short' + procedure: + attributes: + path: + taken: is already used for procedure. You cannot use it because it belongs to another administrator. + # taken_can_be_claimed: est identique à celui d’une autre de vos procedures publiées. Si vous publiez cette procedure, l’ancienne sera dépubliée et ne sera plus accessible au public. Les utilisateurs qui ont commencé un brouillon vont pouvoir le déposer. + invalid: is not valid. It must countain between 3 and 50 characters among a-z, 0-9, '_' et '-'. + + errors: + messages: + # already_confirmed: "a déjà été validé(e), veuillez essayer de vous connecter" + # confirmation_period_expired: "à confirmer dans les %{period}, merci de faire une nouvelle demande" + # expired: "a expiré, merci d’en faire une nouvelle demande" + not_found: "was not found" + not_locked: "was not locked" + not_saved: + one: "1 error prevented this %{resource} from being saved :" + other: "%{count} errors prevented this %{resource} from being saved :" + dossier_not_found: "The file does not exist or you do not have access to it." + dossier_map_not_activated: "The file does not have access to the map." + invalid_siret: "The SIRET is incorrect" + procedure_not_found: "The procedure does not exist" + siret_unknown: 'Sorry, we did not find any establishment registered under this SIRET number.' + # siret_network_error: 'Désolé, la récupération des informations SIRET est temporairement indisponible. Veuillez réessayer dans quelques instants.' + # etablissement_fail: 'Désolé, nous n’avons pas réussi à enregistrer l’établissement correspondant à ce numéro SIRET' + france_connect: + connexion: "Error trying to connect to France Connect." + procedure_archived: "This procedure has been closed, it is no longer possible to submit a file." + procedure_not_draft: "THis procedure is not a draft anymore." + # cadastres_empty: + # one: "Aucune parcelle cadastrale sur la zone sélectionnée" + # other: "Aucune parcelle cadastrale sur les zones sélectionnées" + # quartiers_prioritaires_empty: + # one: "Aucun quartier prioritaire sur la zone sélectionnée" + # other: "Aucun quartier prioritaire sur les zones sélectionnées" + # parcelles_agricoles_empty: + # one: "Aucune parcelle agricole sur la zone sélectionnée" + # other: "Aucune parcelle agricole sur les zones sélectionnées" + + date: + abbr_day_names: + - sun + - mon + - tue + - wed + - thu + - fri + - sat + abbr_month_names: + - + - jan. + - feb. + - mar. + - apr. + - may + - jun. + - jul. + - aug. + - sept. + - oct. + - nov. + - dec. + month_names: + - + - january + - february + - march + - april + - may + - june + - july + - august + - september + - october + - november + - december + order: + - :day + - :month + - :year + day_names: + - sunday + - monday + - tuesday + - wednesday + - thursday + - friday + - saturday + formats: + default: "%d %B %Y" + short: "%e %b" + long: "%e %B %Y" + datetime: + distance_in_words: + about_x_hours: + one: about an hour + other: about %{count} hours + about_x_months: + one: about a month + other: about %{count} months + about_x_years: + one: about a year + other: about %{count} years + almost_x_years: + one: almost a year + other: almost %{count} years + half_a_minute: half a minute + less_than_x_minutes: + zero: less than a minute + one: less than a minute + other: less than %{count} minutes + less_than_x_seconds: + zero: less than a second + one: less than a second + other: less than %{count} seconds + over_x_years: + one: more than a year + other: more than %{count} years + x_days: + one: 1 day + other: "%{count} days" + x_minutes: + one: 1 minute + other: "%{count} minutes" + x_months: + one: 1 month + other: "%{count} months" + x_seconds: + one: 1 second + other: "%{count} seconds" + time: + formats: + default: "%d %B %Y %R" + pluralize: + case: + zero: file + one: file + other: files + processed: + zero: processed + one: processed + other: processed + new: + zero: new + one: new + other: new + followed: + zero: followed + one: followed + other: followed + archived: + zero: archived + one: archived + other: archived + dossier_trouve: + zero: 0 file found + one: 1 file found + other: "%{count} files found" + published: + zero: Published + one: Published + other: Published + closed: + zero: Closed + one: Closed + other: Closed + draft: + zero: Draft + one: Draft + other: Drafts diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 62f2abb4f..06bc5943e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -25,7 +25,12 @@ fr: involved: "Voir les personnes impliquées" no-commentaires: "Il n’y a aucun message dans le fil de discussion, n’hésitez pas à initier le premier." depositaire: "Dépositaire" - pieces: "Pièces jointes" + pj: "Pièces jointes" + asterisk_html: Les champs suivis d’un astérisque ( * ) sont obligatoires. + file_number: Numéro de dossier + subject: Sujet + message: Message + send_mail: Envoyer le message views: pagination: next: Suivant @@ -55,12 +60,6 @@ fr: submit: publish: Publier reopen: Réactiver - support: - info demarche: J’ai un problème lors du remplissage de mon dossier - info instruction: J’ai une question sur l’instruction de mon dossier - produit: J’ai une idée d’amélioration pour votre site - usager perdu: Je ne trouve pas la démarche que je veux faire - autre: Autre sujet supportadmin: admin demande rdv: Demande de RDV pour une présentation à distance de demarches-simplifiees.fr admin question: J’ai une question sur demarches-simplifiees.fr diff --git a/config/locales/views/layouts/_account_dropdown.en.yml b/config/locales/views/layouts/_account_dropdown.en.yml new file mode 100644 index 000000000..e12456467 --- /dev/null +++ b/config/locales/views/layouts/_account_dropdown.en.yml @@ -0,0 +1,8 @@ +en: + layouts: + go_superadmin: "Switch to super-admin" + go_user: "Switch to user" + go_instructor: "Switch to instructor" + go_admin: "Switch to administrator" + profile: "See my profile" + logout: "Log out" diff --git a/config/locales/views/layouts/_account_dropdown.fr.yml b/config/locales/views/layouts/_account_dropdown.fr.yml new file mode 100644 index 000000000..cc9fa9282 --- /dev/null +++ b/config/locales/views/layouts/_account_dropdown.fr.yml @@ -0,0 +1,8 @@ +fr: + layouts: + go_superadmin: "Passer en super-admin" + go_user: "Passer en usager" + go_instructor: "Passer en instructeur" + go_admin: "Passer en administrateur" + profile: "Voir mon profil" + logout: "Se déconnecter" diff --git a/config/locales/views/support/index.en.yml b/config/locales/views/support/index.en.yml new file mode 100644 index 000000000..d2692528c --- /dev/null +++ b/config/locales/views/support/index.en.yml @@ -0,0 +1,32 @@ +en: + support: + contact: Contact + intro_html: Contact us via this form and we will answer you as quickly as possible.
Make sure you provide all the required information so we can help you in the best way. + question: + your_question: Your question + choose_question: Choose your question + procedure_info: I've encountered a problem while completing my application + instruction_info: I have a question about the instruction of my application + product: I have an idea to improve the website + lost_user: I am having trouble finding the procedure I am looking for + other: Other topic + response: + our_answer: 👉 Our answer + procedure_info_html: "

Are you sure that all the mandatory fields ( * ) are properly filled? +

If you have questions about the information requested, contact the service in charge of the procedure.

+

Find more information

" + instruction_info_html: "

If you have questions about the instruction of your application (response delay for example), contact directly the instructor via our mail system.

+

Find more information

+
+

If you are facing technical issues on the website, use the form below. We will not be able to inform you about the instruction of your application.

" + product_html: "

Got an idea? Please check our enhancement dashboard

+

+

➡ Access the enhancement dashboard

" + lost_user_html: "

We invite you to contact the administration in charge of the procedure so they can provide you the link. + It should look like this: %{base_url}/commencer/NOM_DE_LA_DEMARCHE.

+
+

You can find here the most popular procedures (licence, detr, etc.) :

+

%{link_lost_user}

" + notice_pj_product: A screenshot can help us identify the element to improve. + notice_pj_other: A screenshot can help us identify the issue. diff --git a/config/locales/views/support/index.fr.yml b/config/locales/views/support/index.fr.yml new file mode 100644 index 000000000..06b0decbe --- /dev/null +++ b/config/locales/views/support/index.fr.yml @@ -0,0 +1,31 @@ +fr: + support: + contact: Contact + intro_html: Contactez-nous via ce formulaire et nous vous répondrons dans les plus brefs délais.
Pensez bien à nous donner le plus d'informations possible pour que nous puissions vous aider au mieux. + question: + your_question: Votre question + choose_question: Choisir une question + procedure_info: J’ai un problème lors du remplissage de mon dossier + instruction_info: J’ai une question sur l’instruction de mon dossier + product: J’ai une idée d’amélioration pour votre site + lost_user: Je ne trouve pas la démarche que je veux faire + other: Autre sujet + response: + our_answer: 👉 Notre réponse + procedure_info_html: "

Avez-vous bien vérifié que tous les champs obligatoires ( * ) sont remplis ? +

Si vous avez des questions sur les informations à saisir, contactez les services en charge de la démarche.

+

En savoir plus

" + instruction_info_html: "

Si vous avez des questions sur l’instruction de votre dossier (par exemple sur les délais), nous vous invitons à contacter directement les services qui instruisent votre dossier par votre messagerie.

+

En savoir plus

+
+

Si vous souhaitez poser une question pour un problème technique sur le site, utilisez le formulaire ci-dessous. Nous ne pourrons pas vous renseigner sur l'instruction de votre dossier.

" + product_html: "

Une idée ? Pensez à consulter notre tableau de bord des améliorations

+

+

➡ Accéder au tableau des améliorations

" + lost_user_html: "

Nous vous invitons à contacter l’administration en charge de votre démarche pour qu’elle vous indique le lien à suivre. Celui-ci devrait ressembler à cela : %{base_url}/commencer/NOM_DE_LA_DEMARCHE.

+
+

Vous pouvez aussi consulter ici la liste de nos démarches les plus frequentes (permis, detr etc) :

+

%{link_lost_user}

" + notice_pj_product: Une capture d’écran peut nous aider à identifier plus facilement l’endroit à améliorer. + notice_pj_other: Une capture d’écran peut nous aider à identifier plus facilement le problème. From bfa4231f5e6715bbd8d4d107843e9b997ea9aab6 Mon Sep 17 00:00:00 2001 From: Judith Date: Wed, 26 Aug 2020 17:10:24 +0200 Subject: [PATCH 2/2] date and number formats changed according to rails-I18n locale --- config/locales/en.yml | 126 +++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 5f53e265d..62bdf05ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,7 +20,6 @@ # available at http://guides.rubyonrails.org/i18n.html. en: - hello: "Hello world" utils: deconnexion: "Log out" involved: "See concerned people" @@ -64,36 +63,36 @@ en: supportadmin: # admin demande rdv: Demande de RDV pour une présentation à distance de demarches-simplifiees.fr admin question: I have a question about demarches-simplifiees.fr - admin soucis: I have a technical issue on demarches-simplifiees.fr + admin soucis: I am facing a technical issue on demarches-simplifiees.fr admin suggestion produit: I have a suggestion for an evolution - admin demande compte: I wish to open an admin account with an Orange, Wanadoo, etc. email + admin demande compte: I want to open an admin account with an Orange, Wanadoo, etc. email admin autre: Other topic number: currency: format: - delimiter: " " - format: "%n %u" + delimiter: "," + format: "%u%n" precision: 2 - separator: "," + separator: "." significant: false strip_insignificant_zeros: false unit: "€" format: - delimiter: " " + delimiter: "," precision: 3 - separator: "," + separator: "." significant: false strip_insignificant_zeros: false human: decimal_units: format: "%n %u" units: - billion: billion - million: million - quadrillion: quadrillion - thousand: thousand - trillion: trillion + billion: Billion + million: Million + quadrillion: Quadrillion + thousand: Thousand + trillion: Trillion unit: '' format: delimiter: '' @@ -104,12 +103,13 @@ en: format: "%n %u" units: byte: - one: byte - other: bytes - gb: Gb - kb: kb - mb: Mb - tb: Tb + one: Byte + other: Bytes + gb: GB + kb: KB + mb: MB + pb: PB + tb: TB percentage: format: delimiter: '' @@ -200,57 +200,57 @@ en: date: abbr_day_names: - - sun - - mon - - tue - - wed - - thu - - fri - - sat + - Sun + - Mon + - Tue + - Wed + - Thu + - Fri + - Sat abbr_month_names: - - - jan. - - feb. - - mar. - - apr. - - may - - jun. - - jul. - - aug. - - sept. - - oct. - - nov. - - dec. + - Jan + - Feb + - Mar + - Apr + - May + - Jun + - Jul + - Aug + - Sep + - Oct + - Nov + - Dec month_names: - - - january - - february - - march - - april - - may - - june - - july - - august - - september - - october - - november - - december + - January + - February + - March + - April + - May + - June + - July + - August + - September + - October + - November + - December order: - - :day - - :month - :year + - :month + - :day day_names: - - sunday - - monday - - tuesday - - wednesday - - thursday - - friday - - saturday + - Sunday + - Monday + - Tuesday + - Wednesday + - Thursday + - Friday + - Saturday formats: - default: "%d %B %Y" - short: "%e %b" - long: "%e %B %Y" + default: "%Y-%m-%d" + long: "%B %d, %Y" + short: "%b %d" datetime: distance_in_words: about_x_hours: @@ -291,7 +291,7 @@ en: other: "%{count} seconds" time: formats: - default: "%d %B %Y %R" + default: "%B %d %Y %R" pluralize: case: zero: file