From 06cf1bbbcb544d18dddcafd1f24a6e9b94aa7059 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Sun, 7 Apr 2024 16:57:49 +0400
Subject: [PATCH] Improve the copy in "Export inventories" and "Export
 inventory" modal [SCI-10575]

---
 .../_export_repository_rows_modal.html.erb      | 17 +++++++++--------
 config/locales/en.yml                           |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/repositories/_export_repository_rows_modal.html.erb b/app/views/repositories/_export_repository_rows_modal.html.erb
index 1037aae1a..79c0b6be2 100644
--- a/app/views/repositories/_export_repository_rows_modal.html.erb
+++ b/app/views/repositories/_export_repository_rows_modal.html.erb
@@ -13,14 +13,15 @@
            <h4 class="modal-title"><%=t 'zip_export.repositories_modal_label' %></h4>
          </div>
          <div class="modal-body">
-           <div><%=t('zip_export.repository_header_html', repository: repository.name) %></div>
-           <div class="custom-alert-info"><%=t 'zip_export.files_alert' %></div>
-           <div><%=t 'zip_export.repository_footer_html' %></div>
-           <%= f.label :file_type %><br />
-           <%= f.label :file_type, "Csv", value: "csv"  %>
-           <%= f.radio_button :file_type, "csv", checked: true %>
-           <%= f.label :file_type, "xlsx", value: "false" %>
-           <%= f.radio_button :file_type, "xlsx" %>
+           <div class="mb-6"><%=t('zip_export.repository_header_html', repository: repository.name) %></div>
+           <div class="mb-6 custom-alert-info"><%=t 'zip_export.files_alert' %></div>
+           <div class="mb-6"><%=t 'zip_export.repository_footer_html' %></div>
+
+            <%= f.radio_button :file_type, "xlsx" %>
+            <%= f.label :file_type, "xlsx", value: "false", class: "mr-6 ml-3" %>
+
+            <%= f.radio_button :file_type, "csv", checked: true %>
+            <%= f.label :file_type, "Csv", value: "csv", class: "mr-6 ml-3" %>
          </div>
          <div class="modal-footer">
            <button type='button' data-e2e='e2e-BT-exportMD-cancel' class='btn btn-secondary' data-dismiss='modal' id='close-modal-export-repository-rows'><%= t('general.cancel')%></button>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a3bef43ef..545a2cc44 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1927,8 +1927,8 @@ en:
           one: "You are about to export <strong>1</strong> inventory in %{team_name}'s team."
           other: "You are about to export <strong>%{count}</strong> inventories in %{team_name}'s team."
         description_alert: "This process may take minutes to hours, depending on the file size. Any new data entered afterward won't be included in the export."
-        description_p2: "You will receive an email when the .zip file is ready. A link to your file will also appear in your SciNote notification. For security reasons, this link will expire in 7 days."
-        description_p3_html: "After you confirm this export, you will have <strong>%{remaining_export_requests}</strong> export requests left today (max %{requests_limit} requests per day)."
+        description_p2: "You will receive an email and a notification when the download file is ready. For security reasons, the link will expire in 7 days."
+        description_p3_html: "After this export, you will have <strong>%{remaining_export_requests}</strong> export requests left today (max %{requests_limit} requests per day)."
         export: "Export"
       modal_export_limit_exceeded:
         title: "Export denied"
@@ -3812,9 +3812,9 @@ en:
     expired_title: 'Looks like your link has expired.'
     expired_description: 'Please export the data again in order to receive a new link.'
     modal_html: "<p>Your export request is being processed.</p><p>When completed we will <strong>send an email to %{email}</strong> inbox with a link to your exported items. Note that the link will expire in 7 days.</p>"
-    repository_header_html: 'You are about to export selected items in inventory %{repository}.'
+    repository_header_html: 'You are about to export selected items in the inventory %{repository}. The export will exclude the files uploaded to items (only filenames will be exported).'
     files_alert: 'Files uploaded to inventory items will not be exported. Only filenames will be exported.'
-    repository_footer_html: 'Inventory will be exported in a .csv file format. You will receive <strong>email with a link</strong> where you can download it.'
+    repository_footer_html: 'You will receive an <strong>email and a notification</strong> when the download file is ready. For security reasons, the link will expire in 7 days.'
     export_request_success: "Export request received. Your export request is being processed."
     export_error: "Error when creating zip export."
     consumption_modal_label: 'Export consumption'