diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql index f00d0fe02d80c0ece33277a5dab36c4440c4f44b..c0e915d533f6bb956b1993f79395caa4fad94771 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 8ee6182013f906dd2e74a548e66b5197ac68b01f..53b7db4b35c682354be0e5c211c5db70cbf0b1ac 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 99bc92333d63b326b6083738170a6c29da544da0..d644bf77ba2c0c898a8fad1c4f4be598ea50ff43 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 57e33b35d0cae5e4bcee14d510ca60ecd35e9cf9..d325f7a628159d64609bd6a4011100fb521a88a5 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