diff --git a/app/lib/helpscout/form_adapter.rb b/app/lib/helpscout/form_adapter.rb index 937189305..16da5c8fb 100644 --- a/app/lib/helpscout/form_adapter.rb +++ b/app/lib/helpscout/form_adapter.rb @@ -13,12 +13,12 @@ class Helpscout::FormAdapter def self.admin_options [ - [I18n.t(ADMIN_TYPE_QUESTION, scope: [:supportadmin], app_name: APPLICATION_NAME), ADMIN_TYPE_QUESTION], - [I18n.t(ADMIN_TYPE_RDV, scope: [:supportadmin], app_name: APPLICATION_NAME), ADMIN_TYPE_RDV], - [I18n.t(ADMIN_TYPE_SOUCIS, scope: [:supportadmin], app_name: APPLICATION_NAME), 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] + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_QUESTION], app_name: APPLICATION_NAME), ADMIN_TYPE_QUESTION], + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_RDV], app_name: APPLICATION_NAME), ADMIN_TYPE_RDV], + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_SOUCIS], app_name: APPLICATION_NAME), ADMIN_TYPE_SOUCIS], + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_PRODUIT]), ADMIN_TYPE_PRODUIT], + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_DEMANDE_COMPTE]), ADMIN_TYPE_DEMANDE_COMPTE], + [I18n.t(:question, scope: [:support, :admin, ADMIN_TYPE_AUTRE]), ADMIN_TYPE_AUTRE] ] end diff --git a/app/views/support/admin.html.haml b/app/views/support/admin.html.haml index 37f753014..2b30c4ee6 100644 --- a/app/views/support/admin.html.haml +++ b/app/views/support/admin.html.haml @@ -3,10 +3,10 @@ #contact-form .container %h1.new-h1 - = t('contact_team', scope: [:supportadmin]) + = t('.contact_team') .description - = t('admin_intro_html', scope: [:supportadmin], contact_path: contact_path) + = t('.admin_intro_html', contact_path: contact_path) %br %p.mandatory-explanation= t('asterisk_html', scope: [:utils]) @@ -14,19 +14,19 @@ - if !user_signed_in? .contact-champ = label_tag :email do - = t('pro_mail', scope: [:supportadmin]) + = t('.pro_mail') %span.mandatory * = text_field_tag :email, params[:email], required: true .contact-champ = label_tag :type do - = t('your_question', scope: [:supportadmin]) + = t('.your_question') %span.mandatory * = select_tag :type, options_for_select(@options, params[:type]) .contact-champ = label_tag :phone do - = t('pro_phone_number', scope: [:supportadmin]) + = t('.pro_phone_number') = text_field_tag :phone .contact-champ diff --git a/config/locales/views/support/en.yml b/config/locales/views/support/en.yml index e34d8ac30..2dbe52b45 100644 --- a/config/locales/views/support/en.yml +++ b/config/locales/views/support/en.yml @@ -33,18 +33,24 @@ en:

%{link_lost_user}

" other: question: Other topic - supportadmin: - your_question: Your question - admin_intro_html: "

As an administration, you can contact us through this form. We'll answer you as quickly as possibly by e-mail or phone.

-
-

Caution, this form is dedicated to public bodies only. - It does not concern individuals, companies nor associations (except those recognised of public utility). If you belong to one of these categories, contact us here.

" - contact_team: Contact our team - pro_phone_number: Professional phone number (direct line) - pro_mail: Professional email address - admin demande rdv: I request an appointment for an online presentation of %{app_name} - admin question: I have a question about %{app_name} - admin soucis: I am facing a technical issue on %{app_name} - admin suggestion produit: I have a suggestion for an evolution - admin demande compte: I want to open an admin account with an Orange, Wanadoo, etc. email - admin autre: Other topic + admin: + your_question: Your question + admin_intro_html: "

As an administration, you can contact us through this form. We'll answer you as quickly as possibly by e-mail or phone.

+
+

Caution, this form is dedicated to public bodies only. + It does not concern individuals, companies nor associations (except those recognised of public utility). If you belong to one of these categories, contact us here.

" + contact_team: Contact our team + pro_phone_number: Professional phone number (direct line) + pro_mail: Professional email address + admin question: + question: I have a question about %{app_name} + admin demande rdv: + question: I request an appointment for an online presentation of %{app_name} + admin soucis: + question: I am facing a technical issue on %{app_name} + admin suggestion produit: + question: I have a suggestion for an evolution + admin demande compte: + question: I want to open an admin account with an Orange, Wanadoo, etc. email + admin autre: + question: Other topic diff --git a/config/locales/views/support/fr.yml b/config/locales/views/support/fr.yml index 1ac911583..82b8f349c 100644 --- a/config/locales/views/support/fr.yml +++ b/config/locales/views/support/fr.yml @@ -32,19 +32,25 @@ fr:

%{link_lost_user}

" other: question: Autre sujet - supportadmin: - your_question: Votre question - admin_intro_html: "

En tant qu’administration, vous pouvez nous contactez via ce formulaire. Nous vous répondrons dans les plus brefs délais, par email ou par téléphone.

-
-

Attention, ce formulaire est réservé uniquement aux organismes publics. - Il ne concerne ni les particuliers, ni les entreprises, ni les associations (sauf celles reconnues d’utilité publique). Si c'est votre cas, rendez-vous sur notre - formulaire de contact public.

" - contact_team: Contactez notre équipe - pro_phone_number: Numéro de téléphone professionnel (ligne directe) - pro_mail: Adresse e-mail professionnelle - admin demande rdv: Demande de RDV pour une présentation à distance de %{app_name} - admin question: J’ai une question sur %{app_name} - admin soucis: J’ai un problème technique avec %{app_name} - admin suggestion produit: J’ai une proposition d’évolution - admin demande compte: Je souhaite ouvrir un compte administrateur avec un email Orange, Wanadoo, etc. - admin autre: Autre sujet + admin: + your_question: Votre question + admin_intro_html: "

En tant qu’administration, vous pouvez nous contactez via ce formulaire. Nous vous répondrons dans les plus brefs délais, par email ou par téléphone.

+
+

Attention, ce formulaire est réservé uniquement aux organismes publics. + Il ne concerne ni les particuliers, ni les entreprises, ni les associations (sauf celles reconnues d’utilité publique). Si c'est votre cas, rendez-vous sur notre + formulaire de contact public.

" + contact_team: Contactez notre équipe + pro_phone_number: Numéro de téléphone professionnel (ligne directe) + pro_mail: Adresse e-mail professionnelle + admin question: + question: J’ai une question sur %{app_name} + admin demande rdv: + question: Demande de RDV pour une présentation à distance de %{app_name} + admin soucis: + question: J’ai un problème technique avec %{app_name} + admin suggestion produit: + question: J’ai une proposition d’évolution + admin demande compte: + question: Je souhaite ouvrir un compte administrateur avec un email Orange, Wanadoo, etc. + admin autre: + question: Autre sujet