diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 3cd25acfa..c23f08e16 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -7598,8 +7598,8 @@ msgstr "Insert data..." # TRANSLATION # LABEL/ID_EMAIL_SERVER_IS_DEFAULT #: LABEL/ID_EMAIL_SERVER_IS_DEFAULT -msgid "The email server with {0}: {1} is default." -msgstr "The email server with {0}: {1} is default." +msgid "The email server can't be deleted as it is marked as default." +msgstr "The email server can't be deleted as it is marked as default." # TRANSLATION # LABEL/ID_EMAIL_SERVER_NEW diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index d8a2ba452..6a91c72e0 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58105,7 +58105,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_EMAIL_SERVER_EDIT','en','Edit Email Server','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_FROM_MAIL_EMPTY','en','The email has not been sent because configuration email in the Email Server Settings (admin/settings/email) is empty. Please fill this information.','2016-03-13') , ( 'LABEL','ID_EMAIL_SERVER_INSERT_DATA','en','Insert data...','2014-12-24') , -( 'LABEL','ID_EMAIL_SERVER_IS_DEFAULT','en','The email server with {0}: {1} is default.','2014-12-24') , +( 'LABEL','ID_EMAIL_SERVER_IS_DEFAULT','en','The email server can''t be deleted as it is marked as default.','2022-02-02') , ( 'LABEL','ID_EMAIL_SERVER_NEW','en','New Email Server','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_PORT','en','Port','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_RESULT_TESTING','en','Result Testing Email Server','2014-12-24') , diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php index 3f6232730..3c8edeb15 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php @@ -692,7 +692,7 @@ class EmailServer { try { if ($this->checkIfIsDefault($emailServerUid)) { - throw new Exception(G::LoadTranslation("ID_EMAIL_SERVER_IS_DEFAULT", array($fieldNameForException, $emailServerUid))); + throw new Exception(G::LoadTranslation("ID_EMAIL_SERVER_IS_DEFAULT")); } } catch (Exception $e) { throw $e;