refactor(faq): update links to new internal links

demarches-simplifiees · May 7, 2024 · 757d6b8 · 757d6b8
1 parent 2bf3c47
commit 757d6b8
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 54 deletions.
diff --git a/app/views/administrateurs/_breadcrumbs.html.haml b/app/views/administrateurs/_breadcrumbs.html.haml
@@ -35,7 +35,7 @@
         - else
           %p.fr-mb-1w
             = t('more_info_on_test', scope: [:layouts, :breadcrumb])
-            = link_to t('go_to_FAQ', scope: [:layouts, :breadcrumb]), t("url_FAQ", scope: [:layouts, :breadcrumb]), title: new_tab_suffix(t('go_to_FAQ', scope: [:layouts, :breadcrumb])), **external_link_attributes
+            = link_to t('go_to_FAQ', scope: [:layouts, :breadcrumb]), t("url_FAQ", scope: [:layouts, :breadcrumb]), title: new_tab_suffix(t('go_to_FAQ', scope: [:layouts, :breadcrumb]))
           .flex
             %span.fr-badge.fr-badge--new.fr-mr-1w
               = t('draft', scope: [:layouts, :breadcrumb])

diff --git a/app/views/administrateurs/procedures/_publication_form.html.haml b/app/views/administrateurs/procedures/_publication_form.html.haml
@@ -16,7 +16,7 @@
         - c.with_body do
           %p
             = t('.faq_test_alert')
-            = link_to t('.faq_test_alert_link'), t('.faq_test_alert_link_url'), **external_link_attributes
+            = link_to t('.faq_test_alert_link'), t('.faq_test_alert_link_url')
       = render partial: 'publication_form_inputs', locals: { procedure: procedure, closed_procedures: @closed_procedures, form: f }
       = render Dsfr::CalloutComponent.new(title: t('.dpd_title'), heading_level: 'h2') do |c|
         - c.with_body do

diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml
@@ -52,7 +52,7 @@
                   = render partial: 'shared/help/help_dropdown_instructeur'
                 - else
                   // NB: on mobile in order to have links correctly aligned, we need a left icon
-                  = link_to t('help'), t("links.common.faq.url"), class: 'fr-btn dropdown-button', title: new_tab_suffix(t('help')), **external_link_attributes
+                  = link_to t('help'), t("links.common.faq.url"), class: 'fr-btn dropdown-button', title: t('help')
 
 
 

diff --git a/app/views/layouts/commencer/_no_procedure.html.haml b/app/views/layouts/commencer/_no_procedure.html.haml
@@ -7,4 +7,4 @@
       %p= t('.line3')
     %hr
     %p.small-simple= t('.are_you_new', app_name: Current.application_name)
-    = link_to t('views.users.sessions.new.find_procedure'), t("links.common.faq.comment_trouver_ma_demarche_url"), title: new_tab_suffix(t('views.users.sessions.new.find_procedure')), class: "fr-btn fr-btn--secondary", **external_link_attributes
+    = link_to t('views.users.sessions.new.find_procedure'), t("links.common.faq.comment_trouver_ma_demarche_url"), title: new_tab_suffix(t('views.users.sessions.new.find_procedure')), class: "fr-btn fr-btn--secondary"
diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml
@@ -23,7 +23,7 @@
           %h2= t(".have_a_procedure")
           %p.fr-h5= t(".fill_procedure")
 
-          = link_to t(".how_to_find_procedure"), t("links.common.faq.comment_trouver_ma_demarche_url"), class: "fr-btn fr-btn--lg fr-mr-1w fr-mb-2w", title: new_tab_suffix(t(".how_to_find_procedure")), **external_link_attributes
+          = link_to t(".how_to_find_procedure"), t("links.common.faq.comment_trouver_ma_demarche_url"), class: "fr-btn fr-btn--lg fr-mr-1w fr-mb-2w", title: new_tab_suffix(t(".how_to_find_procedure"))
           = link_to t("views.users.sessions.new.connection"), new_user_session_path, class: "fr-btn fr-btn--secondary fr-btn--lg"
 
   .fr-py-6w
@@ -51,7 +51,7 @@
           %h2= t(".question")
           %p.fr-h5= t(".answer_in_faq")
         %div
-          = link_to t(".online_help"), t("links.common.faq.url"), class: "fr-btn fr-btn--lg", title: new_tab_suffix(t(".online_help")), **external_link_attributes
+          = link_to t(".online_help"), t("links.common.faq.url"), class: "fr-btn fr-btn--lg", title: t(".online_help")
 
   .fr-py-6w
     .container

diff --git a/app/views/shared/champs/siret/_etablissement.html.haml b/app/views/shared/champs/siret/_etablissement.html.haml
@@ -8,7 +8,7 @@
 - when :not_found
   %p.fr-error-text
     Nous n’avons pas trouvé d’établissement correspondant à ce numéro de SIRET.
-    = link_to('Plus d’informations', t("links.common.faq.erreur_siret_url"), **external_link_attributes)
+    = link_to('Plus d’informations', t("links.common.faq.erreur_siret_url"))
 
 - when :network_error
   %p.fr-error-text= t('errors.messages.siret_network_error')

diff --git a/app/views/static_pages/accessibility_statement.html.haml b/app/views/static_pages/accessibility_statement.html.haml
@@ -95,10 +95,10 @@
               = t("views.accessibility_statement.preparation.page_six")
             %li
               = link_to t("views.accessibility_statement.preparation.page_seven.label"), t("views.accessibility_statement.preparation.page_seven.url"),
-                title: t("views.accessibility_statement.preparation.page_seven.title"), **external_link_attributes
+                title: t("views.accessibility_statement.preparation.page_seven.title")
             %li
               = link_to t("views.accessibility_statement.preparation.page_eight.label"), t("views.accessibility_statement.preparation.page_eight.url"),
-                title: t("views.accessibility_statement.preparation.page_eight.title"), **external_link_attributes
+                title: t("views.accessibility_statement.preparation.page_eight.title")
             %li
               = t("views.accessibility_statement.preparation.page_nine")
             %li

diff --git a/app/views/users/dossiers/_dossiers_list.html.haml b/app/views/users/dossiers/_dossiers_list.html.haml
@@ -131,4 +131,4 @@
       %p.empty-text-details
         = t('views.users.dossiers.dossiers_list.no_result_text_html', app_base: Current.application_base_url)
       %p
-        = link_to t("root.landing.how_to_find_procedure"), t("links.common.faq.comment_trouver_ma_demarche_url"), class: "fr-btn fr-btn--lg fr-mr-1w fr-mb-2w", **external_link_attributes
+        = link_to t("root.landing.how_to_find_procedure"), t("links.common.faq.comment_trouver_ma_demarche_url"), class: "fr-btn fr-btn--lg fr-mr-1w fr-mb-2w"
diff --git a/app/views/users/sessions/link_sent.html.haml b/app/views/users/sessions/link_sent.html.haml
@@ -24,6 +24,6 @@
 
       %section
         %p.fr-mt-3w
-          Si vous voyez cette page trop souvent, consultez notre aide : #{link_to t("links.common.faq.confirmer_compte_chaque_connexion_url"), t("links.common.faq.confirmer_compte_chaque_connexion_url"), **external_link_attributes}
+          Si vous voyez cette page trop souvent, #{link_to "consultez notre aide", t("links.common.faq.confirmer_compte_chaque_connexion_url")}
         %p.fr-mt-3w
           = t('views.users.shared.contact_us_if_any_trouble_html', href: contact_admin_url)
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -174,12 +174,12 @@ en:
         page_six: "Home page - User search results"
         page_seven:
           label: "FAQ"
-          url: "https://faq.demarches-simplifiees.fr/"
+          url: "/faq"
           title: "FAQ - new tab"
         page_eight:
           label: "FAQ - User (submission of a file)"
-          url: "https://faq.demarches-simplifiees.fr/collection/17-usager-depot-dun-dossier"
-          title: "FAQ - User (submission of a file) - new tab"
+          url: "/faq#accordion-usager-0"
+          title: "FAQ - User (submission of a file)"
         page_nine: "Documentation - Presentation"
         page_ten: "Documentation - Start-up"
         page_eleven: "Documentation - General"

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -170,12 +170,12 @@ fr:
         page_six: "Accueil connecté - Résultats de recherche usager"
         page_seven:
           label: "FAQ"
-          url: "https://faq.demarches-simplifiees.fr/"
+          url: "/faq"
           title: "FAQ - nouvel onglet"
         page_eight:
           label: "FAQ - Usager (dépôt d'un dossier)"
-          url: "https://faq.demarches-simplifiees.fr/collection/17-usager-depot-dun-dossier"
-          title: "FAQ - Usager (dépôt d'un dossier) - nouvel onglet"
+          url: "/faq#accordion-usager-0"
+          title: "FAQ - Usager (dépôt d'un dossier)"
         page_nine: "Documentation - Présentation"
         page_ten: "Documentation - Démarrage"
         page_eleven: "Documentation - Généralités"

diff --git a/config/locales/links.en.yml b/config/locales/links.en.yml
@@ -6,14 +6,13 @@ en:
       faq:
         label: "FAQ"
         title: "Frequently Asked Questions"
-        url: "https://faq.demarches-simplifiees.fr"
-        autosave_url: "https://faq.demarches-simplifiees.fr/article/77-enregistrer-mon-formulaire-pour-le-reprendre-plus-tard?preview=5ec28ca1042863474d1aee00"
-        comment_trouver_ma_demarche_url: "https://faq.demarches-simplifiees.fr/article/59-comment-trouver-ma-demarche"
-        confirmer_compte_chaque_connexion_url: "https://faq.demarches-simplifiees.fr/article/34-je-dois-confirmer-mon-compte-a-chaque-connexion"
-        contacter_service_en_charge_url: "https://faq.demarches-simplifiees.fr/article/12-contacter-le-service-en-charge-de-ma-demarche"
-        email_non_recu_url: "https://faq.demarches-simplifiees.fr/article/79-je-ne-recois-pas-demail"
-        erreur_siret_url: "https://faq.demarches-simplifiees.fr/article/4-erreur-siret"
-        ou_en_est_mon_dossier_url: "https://faq.demarches-simplifiees.fr/article/11-je-veux-savoir-ou-en-est-linstruction-de-ma-demarche"
+        url: "/faq"
+        autosave_url: "/faq/usager/je-veux-enregistrer-mon-formulaire-pour-le-reprendre-plus-tard"
+        comment_trouver_ma_demarche_url: "/faq/usager/comment-trouver-ma-demarche"
+        confirmer_compte_chaque_connexion_url: "/faq/instructeur/je-dois-confirmer-mon-compte-a-chaque-connexion"
+        contacter_service_en_charge_url: "/faq/usager/je-veux-contacter-le-service-en-charge-de-ma-demarche"
+        erreur_siret_url: "/faq/usager/erreur-siret-lors-d-un-depot-de-dossier"
+        ou_en_est_mon_dossier_url: "/faq/usager/je-veux-savoir-ou-en-est-l-instruction-de-ma-demarche"
     footer:
       top_labels:
         hidden_title: Useful links

diff --git a/config/locales/links.fr.yml b/config/locales/links.fr.yml
@@ -8,14 +8,13 @@ fr:
       faq:
         label: "FAQ"
         title: "Foire aux Questions"
-        url: "https://faq.demarches-simplifiees.fr"
-        autosave_url: "https://faq.demarches-simplifiees.fr/article/77-enregistrer-mon-formulaire-pour-le-reprendre-plus-tard?preview=5ec28ca1042863474d1aee00"
-        comment_trouver_ma_demarche_url: "https://faq.demarches-simplifiees.fr/article/59-comment-trouver-ma-demarche"
-        confirmer_compte_chaque_connexion_url: "https://faq.demarches-simplifiees.fr/article/34-je-dois-confirmer-mon-compte-a-chaque-connexion"
-        contacter_service_en_charge_url: "https://faq.demarches-simplifiees.fr/article/12-contacter-le-service-en-charge-de-ma-demarche"
-        email_non_recu_url: "https://faq.demarches-simplifiees.fr/article/79-je-ne-recois-pas-demail"
-        erreur_siret_url: "https://faq.demarches-simplifiees.fr/article/4-erreur-siret"
-        ou_en_est_mon_dossier_url: "https://faq.demarches-simplifiees.fr/article/11-je-veux-savoir-ou-en-est-linstruction-de-ma-demarche"
+        url: "/faq"
+        autosave_url: "/faq/usager/je-veux-enregistrer-mon-formulaire-pour-le-reprendre-plus-tard"
+        comment_trouver_ma_demarche_url: "/faq/usager/comment-trouver-ma-demarche"
+        confirmer_compte_chaque_connexion_url: "/faq/instructeur/je-dois-confirmer-mon-compte-a-chaque-connexion"
+        contacter_service_en_charge_url: "/faq/usager/je-veux-contacter-le-service-en-charge-de-ma-demarche"
+        erreur_siret_url: "/faq/usager/erreur-siret-lors-d-un-depot-de-dossier"
+        ou_en_est_mon_dossier_url: "/faq/usager/je-veux-savoir-ou-en-est-l-instruction-de-ma-demarche"
     footer:
       top_labels:
         hidden_title: Liens pratiques

diff --git a/config/locales/views/administrateurs/procedures/en.yml b/config/locales/views/administrateurs/procedures/en.yml
@@ -58,7 +58,7 @@ en:
       publication_form:
         faq_test_alert: Have you thought about testing your procedure before publishing it? To help you in this test phase, you can
         faq_test_alert_link: consult our best practices guide.
-        faq_test_alert_link_url: "https://faq.demarches-simplifiees.fr/category/49-comment-tester-ma-demarche"
+        faq_test_alert_link_url: "/faq#accordion-administrateur-2"
         draft_changed_procedure_alert: "Publish a new version of your procedure. The following changes will be applied:"
         dpd_title: Before publishing
         dpd_part_1: Have you thought about informing your Personal Data Protection Officer (DPO).

diff --git a/config/locales/views/administrateurs/procedures/fr.yml b/config/locales/views/administrateurs/procedures/fr.yml
@@ -58,7 +58,7 @@ fr:
       publication_form:
         faq_test_alert: Avez-vous bien pensé à tester votre démarche avant de la publier ? Pour vous aider dans cette phase de test, vous pouvez
         faq_test_alert_link: consulter notre guide de bonnes pratiques.
-        faq_test_alert_link_url: "https://faq.demarches-simplifiees.fr/category/49-comment-tester-ma-demarche"
+        faq_test_alert_link_url: "/faq#accordion-administrateur-2"
         draft_changed_procedure_alert: "Publiez une nouvelle version de votre démarche. Les modifications suivantes seront appliquées :"
         dpd_title: Avant de publier
         dpd_part_1: Avez-vous bien pensé à informer votre Délégué à la Protection des Données personnelles (DPD).

diff --git a/config/locales/views/layouts/_breadcrumb.en.yml b/config/locales/views/layouts/_breadcrumb.en.yml
@@ -15,5 +15,5 @@ en:
       draft: "Draft"
       more_info_on_test: "For more information on test stage"
       go_to_FAQ: "read FAQ"
-      url_FAQ: "https://faq.demarches-simplifiees.fr/category/49-comment-tester-ma-demarche"
+      url_FAQ: "/faq#accordion-administrateur-2"
       faq: Frequently Asked Questions
diff --git a/config/locales/views/layouts/_breadcrumb.fr.yml b/config/locales/views/layouts/_breadcrumb.fr.yml
@@ -15,5 +15,5 @@ fr:
       draft: "En test"
       more_info_on_test: "Pour plus d’information sur la phase de test"
       go_to_FAQ: "consulter la FAQ"
-      url_FAQ: "https://faq.demarches-simplifiees.fr/category/49-comment-tester-ma-demarche"
+      url_FAQ: "/faq#accordion-administrateur-2"
       faq: Foire aux Questions
diff --git a/doc/faqs/usager/erreur-siret-lors-depot-de-dossier.fr.md b/doc/faqs/usager/erreur-siret-lors-depot-de-dossier.fr.md
@@ -1,5 +1,5 @@
 ---
-title: "Erreur SIRET lors d’un dépôt de dossier sur %{application_name}"
+title: "Erreur SIRET lors d’un dépôt de dossier"
 category: usager
 subcategory: dossier_technical_issue
 slug: "erreur-siret-lors-d-un-depot-de-dossier"

diff --git a/public/500.html b/public/500.html
@@ -2110,10 +2110,8 @@
                     <!-- / NB: on mobile in order to have links correctly aligned, we need a left icon -->
                     <a
                       class="fr-btn dropdown-button"
-                      title="Aide — Nouvel onglet"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://faq.demarches-simplifiees.fr/"
+                      title="Aide"
+                      href="/faq"
                       >Aide</a
                     >
                   </li>

diff --git a/public/502.html b/public/502.html
@@ -2109,10 +2109,8 @@
                     <!-- / NB: on mobile in order to have links correctly aligned, we need a left icon -->
                     <a
                       class="fr-btn dropdown-button"
-                      title="Aide — Nouvel onglet"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://faq.demarches-simplifiees.fr/"
+                      title="Aide"
+                      href="/faq"
                       >Aide</a
                     >
                   </li>

diff --git a/public/503.html b/public/503.html
@@ -2109,10 +2109,8 @@
                     <!-- / NB: on mobile in order to have links correctly aligned, we need a left icon -->
                     <a
                       class="fr-btn dropdown-button"
-                      title="Aide — Nouvel onglet"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://faq.demarches-simplifiees.fr/"
+                      title="Aide
+                      href="/faq"
                       >Aide</a
                     >
                   </li>

diff --git a/public/504.html b/public/504.html
@@ -2109,10 +2109,8 @@
                     <!-- / NB: on mobile in order to have links correctly aligned, we need a left icon -->
                     <a
                       class="fr-btn dropdown-button"
-                      title="Aide — Nouvel onglet"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://faq.demarches-simplifiees.fr/"
+                      title="Aide"
+                      href="/faq"
                       >Aide</a
                     >
                   </li>