fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2104

Browse Source
This commit is contained in:
Paula Quispe
2022-02-02 18:55:44 -04:00
parent 19add23615
commit a984059b8c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -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

2
workflow/engine/data/mysql/insert.sql
View File

@@ -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') ,

2
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -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;