From 1fafb0dc1f92f893295615e8915d762914fdb12b Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 9 Oct 2019 15:40:12 +0100
Subject: [PATCH] FIX code review

---
 migration/19.12/1912.sql     | 3 +--
 sql/data_en.sql              | 2 +-
 src/frontend/lang/lang-en.ts | 3 ---
 src/frontend/lang/lang-nl.ts | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index f00d0fe02d8..c0e915d533f 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -321,12 +321,11 @@ WHERE service_id = 'edit_recipient_outside_process' OR service_id = 'update_diff
 DELETE FROM usergroups_services WHERE service_id = 'edit_recipient_outside_process';
 DELETE FROM usergroups_services WHERE service_id = 'update_list_diff_in_details';
 DELETE FROM usergroups_services WHERE service_id = 'edit_recipient_in_process';
-UPDATE priorities SET delays = 30 WHERE delays IS NULL;
-
 
 /* REFACTORING MODIFICATION */
 ALTER TABLE notif_email_stack ALTER COLUMN attachments TYPE text;
 ALTER TABLE tags ALTER COLUMN label TYPE character varying(128);
+UPDATE priorities SET delays = 30 WHERE delays IS NULL;
 ALTER TABLE priorities ALTER COLUMN delays SET NOT NULL;
 
 
diff --git a/sql/data_en.sql b/sql/data_en.sql
index 8ee6182013f..53b7db4b35c 100644
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -919,7 +919,7 @@ INSERT INTO parameters (id, description, param_value_string) VALUES ('homepage_m
 INSERT INTO parameters (id, description, param_value_string) VALUES ('thumbnailsSize', 'Résolution des imagettes', '750x900');
 INSERT INTO parameters (id, description, param_value_int) VALUES ('keepDestForRedirection', 'If enabled (1), put recipient in copy for diffusion list when redirecting', 0);
 INSERT INTO parameters (id, description, param_value_int) VALUES ('QrCodePrefix', 'If enabled (1), add "Maarch_" before the content in QrCode. (Can be use with MaarchCapture >= 1.4)', 0);
-INSERT INTO parameters (id, description, param_value_int) VALUES ('workingDays', 'If enabled (1), processing time are calculated in working days (Monday to Friday). Otherwise, in calendar days', 1);
+INSERT INTO parameters (id, description, param_value_int) VALUES ('workingDays', 'If enabled (1), processing time is calculated in working days (Monday to Friday). Otherwise, in calendar days', 1);
 
 ------------
 --DIFFLIST_TYPES
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 99bc92333d6..d644bf77ba2 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1132,9 +1132,6 @@ export const LANG_EN = {
     "indexing_outgoing" : "outgoing",
     "indexing_internal" : "internal",
     "indexing_ged_doc" : "GED",
-    "createMsg" : "Do you want to create",
-    "folderDeleteWarnMsg" : "Do you want to delete",
-    "folderDeleteWarnMsg2" : "previously created ?",
     "noSelectedFolder" : "No selected folder",
     "noSelectedTag" : "No selected tag",
     "searchTag" : "Search tag",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 57e33b35d0c..d325f7a6281 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1158,9 +1158,6 @@ export const LANG_NL = {
     "indexing_outgoing" : "outgoing", //_TO_TRANSLATE
     "indexing_internal" : "internal", //_TO_TRANSLATE
     "indexing_ged_doc" : "GED", //_TO_TRANSLATE
-    "createMsg" : "Do you want to create", //_TO_TRANSLATE
-    "folderDeleteWarnMsg" : "Do you want to delete", //_TO_TRANSLATE
-    "folderDeleteWarnMsg2" : "previously created ?", //_TO_TRANSLATE
     "noSelectedFolder" : "No selected folder", //_TO_TRANSLATE
     "noSelectedTag" : "No selected tag", //_TO_TRANSLATE
     "searchTag" : "Search tag", //_TO_TRANSLATE
-- 
GitLab