From 5589b278833c5c465b41ceae0119ee3cf8ce14c8 Mon Sep 17 00:00:00 2001
From: mlorb <mlorber@biosistemika.com>
Date: Fri, 23 Mar 2018 14:39:09 +0100
Subject: [PATCH] improve message for deleting sample/report items

---
 app/views/repositories/_delete_record_modal.html.erb | 3 +--
 app/views/samples/_delete_samples_modal.html.erb     | 5 ++---
 config/locales/en.yml                                | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/repositories/_delete_record_modal.html.erb b/app/views/repositories/_delete_record_modal.html.erb
index 6e54f5833..fafb2bdb8 100644
--- a/app/views/repositories/_delete_record_modal.html.erb
+++ b/app/views/repositories/_delete_record_modal.html.erb
@@ -4,10 +4,9 @@
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title"><%= t("repositories.modal_delete_record.title") %></h4>
-        <%= t("repositories.modal_delete_record.notice") %>
       </div>
       <div class="modal-body">
-        <%= t("repositories.modal_delete_record.other_records") %>
+        <%= t("repositories.modal_delete_record.notice") %>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="onClickDeleteRecord();">
diff --git a/app/views/samples/_delete_samples_modal.html.erb b/app/views/samples/_delete_samples_modal.html.erb
index ee9292c58..acde4aaa0 100644
--- a/app/views/samples/_delete_samples_modal.html.erb
+++ b/app/views/samples/_delete_samples_modal.html.erb
@@ -4,10 +4,9 @@
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title"><%= t("samples.modal_delete.title") %></h4>
-        <%= t("samples.modal_delete.notice") %>
       </div>
       <div class="modal-body">
-        <%= t("samples.modal_delete.other_samples") %>
+        <%= t("samples.modal_delete.notice") %>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" onclick="$('.delete_samples_submit').click();"><%= t("samples.modal_delete.delete") %></button>
@@ -15,4 +14,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 33686365e..36c65f20e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -940,7 +940,6 @@ en:
     modal_delete_record:
       title: "Delete items"
       notice: "Are you sure you want to delete the selected item(s)?"
-      other_records: "Only items created by you will be deleted."
       delete: "Delete item(s)"
     modal_delete_column:
       title: "Delete a column"
@@ -1017,7 +1016,6 @@ en:
     modal_delete:
       title: "Delete samples"
       notice: "Are you sure you want to delete the selected samples?"
-      other_samples: "Only samples created by you will be deleted."
       delete: "Delete samples"
     modal_add_custom_field:
       title_html: "Add new column to team <strong>%{team}</strong>"