From 82d89623fc29f7aeb469f7df0a63c22d33d15d93 Mon Sep 17 00:00:00 2001 From: Amit Gupta Date: Fri, 26 Jun 2015 11:30:03 +0530 Subject: [PATCH 8/8] Bug 6810 - Fix QA failures - Change letter code from MEMEXP to MEMBERSHIP_EXPIRY - add <> in letter --- .../bug_6810-add_memexp_notification.sql | 2 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +- .../data/mysql/en/mandatory/sample_notices.sql | 2 +- .../data/mysql/es-ES/mandatory/sample_notices.sql | 2 +- .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +- installer/data/mysql/it-IT/necessari/notices.sql | 2 +- .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +- .../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +- .../data/mysql/ru-RU/mandatory/sample_notices.sql | 3 +-- .../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_6810-add_memexp_notification.sql b/installer/data/mysql/atomicupdate/bug_6810-add_memexp_notification.sql index 025d80a..6c8438d 100644 --- a/installer/data/mysql/atomicupdate/bug_6810-add_memexp_notification.sql +++ b/installer/data/mysql/atomicupdate/bug_6810-add_memexp_notification.sql @@ -1 +1 @@ -INSERT IGNORE INTO letter (module, code, name, title,content) VALUES('members','MEMEXP','Account expiration','Account expiration','Dear <> <> <>,\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); \ No newline at end of file +INSERT IGNORE INTO letter (module, code, name, title,content) VALUES('members','MEMBERSHIP_EXPIRY','Account expiration','Account expiration','Dear <> <> <>,\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql index 935c54b..fa07aab 100644 --- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql +++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql @@ -138,4 +138,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Benachrichtigung bei Zugang', 'Bestelltes Medium ist eingetroffen', 'Liebe/r <> <>,\n\nDie Bestellung <> (<>) ist eingetroffen und wird bearbeitet.\n\nIhr Bibliotheksteam', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql index 31d9314..a044e8f 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.sql +++ b/installer/data/mysql/en/mandatory/sample_notices.sql @@ -157,4 +157,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql index 57edbe6..35e8ad1 100644 --- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql +++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql @@ -152,4 +152,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql index 231dc7a..450310c 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -153,4 +153,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 44ef1c6..b940894 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -150,4 +150,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql index 6fff22e..17bb51d 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -172,4 +172,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 9ac3418..fe8d45a 100644 --- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql +++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ -150,4 +150,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index bc4f4de..da79aad 100644 --- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql +++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ -150,6 +150,5 @@ Your library.' INSERT INTO letter(module, code, branchcode, name, title, content, message_transport_type) VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); - INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql index 9feb99d..d13d77e 100644 --- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql +++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ -151,4 +151,4 @@ INSERT INTO letter(module, code, branchcode, name, title, content, message_trans VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <> <>,\n\n The order <> (<>) has been received.\n\nYour library.', 'email'); INSERT INTO letter (module, code, branchcode, name, title, is_html, content) -VALUES ('members','MEMEXP','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian'); +VALUES ('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration', '0', 'Dear <> <> <>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<>'); -- 1.7.9.5