improve wording and display for export page

This commit is contained in:
Lisa Durand 2023-09-18 17:06:18 +02:00 committed by Colin Darie
parent 282df1b44b
commit 58a143b2c7
No known key found for this signature in database
GPG key ID: 8C76CADD40253590
6 changed files with 15 additions and 12 deletions

View file

@ -6,11 +6,7 @@
%span= ready_link_label_extra_infos(export) %span= ready_link_label_extra_infos(export)
- if export.old? - if export.old?
= button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut, force_export: true), refresh_button_options(export).merge(role: 'menuitem') = button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut, force_export: true), refresh_button_options(export).merge(role: 'menuitem')
- elsif export.failed? - elsif export.pending?
%li.fr-mb-2w
= failed_label(export)
= button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut, force_export: true), refresh_button_options(export).merge(role: 'menuitem')
- else
%li.fr-mb-2w %li.fr-mb-2w
%span{ data: poll_controller_options(export) } %span{ data: poll_controller_options(export) }
= pending_label(export) = pending_label(export)

View file

@ -10,7 +10,7 @@ module Administrateurs
if export.available? if export.available?
respond_to do |format| respond_to do |format|
format.turbo_stream do format.turbo_stream do
flash.notice = t('.export_available_html', file_format: export.format, file_url: export.file.url) flash.notice = t('administrateurs.exports.export_available_html', file_format: export.format, file_url: export.file.url)
end end
format.html do format.html do
@ -21,11 +21,11 @@ module Administrateurs
respond_to do |format| respond_to do |format|
format.turbo_stream do format.turbo_stream do
if !params[:no_progress_notification] if !params[:no_progress_notification]
flash.notice = t('.export_pending') flash.notice = t('administrateurs.exports.export_pending')
end end
end end
format.html do format.html do
redirect_to admin_procedure_archives_url(@procedure), notice: t('.export_pending') redirect_to admin_procedure_archives_url(@procedure), notice: t('administrateurs.exports.export_pending')
end end
end end
end end

View file

@ -181,7 +181,7 @@ module Instructeurs
if export.available? if export.available?
respond_to do |format| respond_to do |format|
format.turbo_stream do format.turbo_stream do
flash.notice = t('.export_available_html', file_format: export.format, file_url: export.file.url) flash.notice = t('instructeurs.procedures.export_available_html', file_format: export.format, file_url: export.file.url)
end end
format.html do format.html do
@ -192,11 +192,11 @@ module Instructeurs
respond_to do |format| respond_to do |format|
format.turbo_stream do format.turbo_stream do
if !params[:no_progress_notification] if !params[:no_progress_notification]
flash.notice = t('.export_pending_html', url: exports_instructeur_procedure_path(procedure)) flash.notice = t('instructeurs.procedures.export_pending_html', url: exports_instructeur_procedure_path(procedure))
end end
end end
format.html do format.html do
redirect_to exports_instructeur_procedure_path(procedure), notice: t('.export_pending_html', url: exports_instructeur_procedure_path(procedure)) redirect_to exports_instructeur_procedure_path(procedure), notice: t('instructeurs.procedures.export_pending_html', url: exports_instructeur_procedure_path(procedure))
end end
end end
end end

View file

@ -6,7 +6,10 @@
[t('.title')]] } [t('.title')]] }
.fr-container .fr-container
%h1= title %h1= t('.title')
= render Dsfr::CalloutComponent.new(title: nil) do |c|
- c.with_body do
%p= t('.export_description')
- if @exports.present? - if @exports.present?
= render Dossiers::ExportLinkComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count, class_btn: 'fr-btn--tertiary', export_url: method(:download_export_instructeur_procedure_path)) = render Dossiers::ExportLinkComponent.new(procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count, class_btn: 'fr-btn--tertiary', export_url: method(:download_export_instructeur_procedure_path))

View file

@ -4,4 +4,6 @@ en:
export_available_html: The export in %{file_format} format is ready. You can <a href="%{file_url}">download</a> export_available_html: The export in %{file_format} format is ready. You can <a href="%{file_url}">download</a>
export_pending_html: We generate this export. You will be able to download it in a few minutes from <a href="%{url}">the exports list</a>. export_pending_html: We generate this export. You will be able to download it in a few minutes from <a href="%{url}">the exports list</a>.
exports: exports:
title: Exports list
export_description: This list of exports contains the exports you requested as well as those requested by instructors belonging to the same group.
no_export_html: You have no export at the moment. <br> Can't find an export? It may have expired, exports are deleted after %{expiration_time} hours. no_export_html: You have no export at the moment. <br> Can't find an export? It may have expired, exports are deleted after %{expiration_time} hours.

View file

@ -4,4 +4,6 @@ fr:
export_available_html: Lexport au format %{file_format} est prêt. Vous pouvez le <a href="%{file_url}">télécharger</a> export_available_html: Lexport au format %{file_format} est prêt. Vous pouvez le <a href="%{file_url}">télécharger</a>
export_pending_html: Nous générons cet export. Vous pourrez le télécharger dans quelques minutes depuis <a href="%{url}">la liste des exports</a>. export_pending_html: Nous générons cet export. Vous pourrez le télécharger dans quelques minutes depuis <a href="%{url}">la liste des exports</a>.
exports: exports:
title: Liste des exports
export_description: Cette liste d'exports contient les exports que vous avez demandé ainsi que ceux demandés par les instructeurs appartenant au même groupe.
no_export_html: Vous n'avez pas d'export pour le moment. <br> Vous ne trouvez pas un export ? Il a peut-être expiré, les exports sont supprimés au bout de %{expiration_time} heures. no_export_html: Vous n'avez pas d'export pour le moment. <br> Vous ne trouvez pas un export ? Il a peut-être expiré, les exports sont supprimés au bout de %{expiration_time} heures.