From 7ee255defc1e09c311da30fe970bd8fa77c88ae9 Mon Sep 17 00:00:00 2001 From: Roland Dalmulder Date: Mon, 23 May 2022 11:01:28 +0200 Subject: [PATCH] Add extra text to default mail template Signed-off-by: Roland Dalmulder --- .../components/com_admin/sql/updates/mysql/4.2.0-2022-05-22.sql | 2 +- .../com_admin/sql/updates/postgresql/4.2.0-2022-05-22.sql | 2 +- administrator/language/en-GB/plg_workflow_notification.ini | 2 +- installation/sql/mysql/supports.sql | 2 +- installation/sql/postgresql/supports.sql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-05-22.sql b/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-05-22.sql index b958fa043cb82..d9465dbcad1c3 100644 --- a/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-05-22.sql +++ b/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-05-22.sql @@ -1,2 +1,2 @@ INSERT IGNORE INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES -('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionName","toStage","extraText"]}'); +('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionname","tostage","extratext"]}'); diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-05-22.sql b/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-05-22.sql index 86eb39a7c2ade..67d73cb2b15e0 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-05-22.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-05-22.sql @@ -1,3 +1,3 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES -('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionName","toStage","extraText"]}') +('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionname","tostage","extratext"]}') ON CONFLICT DO NOTHING; diff --git a/administrator/language/en-GB/plg_workflow_notification.ini b/administrator/language/en-GB/plg_workflow_notification.ini index b8cab143d5946..add23d5435617 100644 --- a/administrator/language/en-GB/plg_workflow_notification.ini +++ b/administrator/language/en-GB/plg_workflow_notification.ini @@ -9,7 +9,7 @@ PLG_WORKFLOW_NOTIFICATION="Workflow - Notification" PLG_WORKFLOW_NOTIFICATION_ADDTEXT="The stage has changed" PLG_WORKFLOW_NOTIFICATION_ADDTEXT_DESC="This text will be sent: Title [title], changed by [user], new state: [state]. You can add your own text to this message and you can localise the text by using a language key and creating a language override." PLG_WORKFLOW_NOTIFICATION_ADDTEXT_LABEL="Additional Message Text" -PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG="Title: {TITLE}. Transition {TRANSITIONNAME} performed by {USER}. New state: {TOSTAGE}." +PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG="Title: {TITLE}. Transition {TRANSITIONNAME} performed by {USER}. New state: {TOSTAGE}.{EXTRATEXT}" PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT="The status of {TITLE} has been changed" PLG_WORKFLOW_NOTIFICATION_MAIL_MAIL_DESC="Mail sent to the selected usergroup and/or users set for the transition" PLG_WORKFLOW_NOTIFICATION_MAIL_MAIL_TITLE="Workflow: Transition Mail" diff --git a/installation/sql/mysql/supports.sql b/installation/sql/mysql/supports.sql index 5b24198015e04..b4831d973ef41 100644 --- a/installation/sql/mysql/supports.sql +++ b/installation/sql/mysql/supports.sql @@ -439,4 +439,4 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec ('plg_system_tasknotification.fatal_recovery_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'), ('plg_system_tasknotification.orphan_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'), ('plg_system_tasknotification.success_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_BODY', '', '', '{"tags":["task_id", "task_title", "exec_data_time", "task_output"]}'), -('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionName","toStage","extraText"]}'); +('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionname","tostage","extratext"]}'); diff --git a/installation/sql/postgresql/supports.sql b/installation/sql/postgresql/supports.sql index 1841a8a98a9e6..193a30e4558e8 100644 --- a/installation/sql/postgresql/supports.sql +++ b/installation/sql/postgresql/supports.sql @@ -450,4 +450,4 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec ('plg_system_tasknotification.fatal_recovery_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'), ('plg_system_tasknotification.orphan_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'), ('plg_system_tasknotification.success_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_BODY', '', '', '{"tags":["task_id", "task_title", "exec_data_time", "task_output"]}'), -('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionName","toStage","extraText"]}'); +('plg_workflow_notification.mail', 'plg_workflow_notification', '', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_SUBJECT', 'PLG_WORKFLOW_NOTIFICATION_EMAIL_ON_TRANSITION_MSG', '', '', '{"tags":["siteurl","title","user","transitionname","tostage","extratext"]}');