DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix(header): add missing i18n

Browse source
This commit is contained in:
Martin 2022-09-02 10:12:09 +02:00 • committed by mfo
parent fb0e863efd
commit 795f6ab29b
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/views/layouts/_header.haml
View file

@ -20,8 +20,7 @@
.fr-header__navbar
- if is_search_enabled
%button.fr-btn--search.fr-btn{ "aria-controls" => "search-modal", "data-fr-opened" => "false", :title => t('views.users.dossiers.search.search_file') }= t('views.users.dossiers.search.search_file')
%button#button_burger.fr-btn--menu.fr-btn{ "aria-controls" => "burger-menu", "aria-haspopup" => "menu", "data-fr-opened" => "false", :title => "Menu" } Menu
%button.fr-btn--menu.fr-btn{ "aria-controls" => "burger-menu", "aria-haspopup" => "menu", "data-fr-opened" => "false", :title => "Menu" } Menu
.fr-header__service
- root_profile_link, root_profile_libelle = root_path_info_for_profile(nav_bar_profile)
@ -73,31 +72,17 @@
= render partial: 'layouts/search_dossiers_form', locals: { search_endpoint: recherche_dossiers_path }
- has_header = [is_instructeur_context, is_expert_context, is_user_context]
<<<<<<< HEAD
#burger-menu.fr-header__menu.fr-modal{ "aria-labelledby" => "button_burger" }
#burger-menu.fr-header__menu.fr-modal{ "aria-labelledby" => "burger_button" }
.fr-container
%button.fr-btn--close.fr-btn{ "aria-controls" => "burger-menu", :title => t('close_modal', scope: [:layouts, :header]) }= t('close_modal', scope: [:layouts, :header])
%button#burger_button.fr-btn--close.fr-btn{ "aria-controls" => "burger-menu", :title => t('close_modal', scope: [:layouts, :header]) }= t('close_modal', scope: [:layouts, :header])
.fr-header__menu-links
%nav#navigation-478.fr-nav{ "aria-label" => "Menu principal", :role => "navigation" }
#burger-menu.fr-header__menu.fr-modal{"aria-labelledby" => "button-477"}
.fr-container
%button.fr-btn--close.fr-btn{"aria-controls" => "burger-menu", :title => "Fermer"} Fermer
%div.fr-header__menu-links
%nav#navigation-478.fr-nav{"aria-label" => "Menu principal", :role => "navigation"}
= link_to t('layouts.header.back'), url_for(:back), title: t('layouts.header.back'), class: 'fr-nav__link'
=======
#burger-menu.fr-header__menu.fr-modal{ "aria-labelledby" => "button-477" }
.fr-container
%button.fr-btn--close.fr-btn{ "aria-controls" => "burger-menu", :title => "Fermer" } Fermer
.fr-header__menu-links
%nav#navigation-478.fr-nav{ "aria-label" => "Menu principal", :role => "navigation" }
%nav#navigation-478.fr-nav{ "aria-label" => t('main_menu', scope: [:layouts, :header]) , :role => "navigation" }
%ul.fr-nav__list
-# Questionner UX pour un back JS
- if params[:controller] == 'users/commencer'
%li.fr-nav__item
= link_to 'Revenir en arrière', url_for(:back), title: "Revenir sur le site de mon administration", class: 'fr-nav__link'
= link_to t('back', scope: [:layouts, :header]), url_for(:back), title: t('back_title', scope: [:layouts, :header]), class: 'fr-nav__link'
>>>>>>> 1d4c3fada (fix(spec): 1. visit new_user_session_path instead of navigating to it. 2. change way to submit search according to dsfr html. 3. avoid nav without aria label. 4. various lint fixes)
- if is_instructeur_context
- if current_instructeur.procedures.any?
- current_url = request.path_info

1
config/locales/en.yml
View file

@ -70,6 +70,7 @@ en:
close_modal: 'Fermer'
back: "Back"
back_title: "Revenir sur le site de mon administration"
main_menu: "Main menu"
locale_dropdown:
languages: "Languages"
select_locale: "Choose a language"

1
config/locales/fr.yml
View file

@ -60,6 +60,7 @@ fr:
close_modal: 'Fermer'
back: "Revenir en arrière"
back_title: "Revenir sur le site de mon administration"
main_menu: "Menu principal"
locale_dropdown:
languages: "Langues"
select_locale: "Sélectionner une langue"