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

Merged in bugfix/PMCORE-4003 (pull request #8642)

Browse Source 
PMCORE-4003 ID_EMAIL_EVENT does not have translation

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Roly Gutierrez
2023-01-06 12:45:50 +00:00
committed by Julio Cesar Laura Avendaño
parent 7c7c7e5e84 3653cf6066
commit 0dc209c21a
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7565,6 +7565,12 @@ msgstr "The \"Email Notifications\" is not enabled, please contact to your Syste
msgid "Please enter a valid email address."
msgstr "Please enter a valid email address."
# TRANSLATION
# LABEL/ID_EMAIL_EVENT
#: LABEL/ID_EMAIL_EVENT
msgid "Email event"
msgstr "Email event"
# TRANSLATION
# LABEL/ID_EMAIL_EVENT_CONFIGURATION_EMAIL
#: LABEL/ID_EMAIL_EVENT_CONFIGURATION_EMAIL
@@ -19343,6 +19349,12 @@ msgstr "Messages History"
msgid "There is at least one empty date field in the holiday grid, please check and try again."
msgstr "There is at least one empty date field in the holiday grid, please check and try again."
# TRANSLATION
# LABEL/ID_MESSAGE_EVENT
#: LABEL/ID_MESSAGE_EVENT
msgid "Message Event"
msgstr "Message Event"
# TRANSLATION
# LABEL/ID_MESSAGE_EVENT_DEFINITION_ALREADY_REGISTERED
#: LABEL/ID_MESSAGE_EVENT_DEFINITION_ALREADY_REGISTERED
@@ -25111,7 +25123,7 @@ msgstr "Service Task"
# TRANSLATION
# LABEL/ID_SERVICE_TASK_UNTITLED
#: LABEL/ID_SERVICE_TASKUNTITLED
#: LABEL/ID_SERVICE_TASK_UNTITLED
msgid "Untitled - Service Task"
msgstr "Untitled - Service Task"

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

@@ -58100,6 +58100,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EMAIL_DOES_NOT_MATCH_FOR_USER','en','The email doesn''t match for user:','2014-01-15') ,
( 'LABEL','ID_EMAIL_ENGINE_IS_NOT_ENABLED','en','The "Email Notifications" is not enabled, please contact to your System Administrator.','2014-01-15') ,
( 'LABEL','ID_EMAIL_ENTER_VALID','en','Please enter a valid email address.','2014-01-15') ,
( 'LABEL','ID_EMAIL_EVENT','en','Email event','2022-11-23') ,
( 'LABEL','ID_EMAIL_EVENT_CONFIGURATION_EMAIL','en','Email event: {0}, in process: {1}, cannot send any mail because its configuration needs to be completed.','2016-07-04') ,
( 'LABEL','ID_EMAIL_EVENT_DEFINITION_DOES_NOT_EXIST','en','The email event definition does not exist.','2016-07-05') ,
( 'LABEL','ID_EMAIL_MORE_THAN_ONE_USER','en','This email is assigned to more than one user. Please contact your administrator.','2015-09-08') ,
@@ -60119,6 +60120,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MESSAGES','en','Messages','2014-01-15') ,
( 'LABEL','ID_MESSAGES_HISTORY','en','Messages History','2014-01-15') ,
( 'LABEL','ID_MESSAGE_EMPTY_DATE_FIELD','en','There is at least one empty date field in the holiday grid, please check and try again.','2014-01-15') ,
( 'LABEL','ID_MESSAGE_EVENT','en','Message Event','2022-11-23') ,
( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_ALREADY_REGISTERED','en','The Message-Event-Definition with {0}: {1} already registered.','2015-02-20') ,
( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_EXIST','en','The Message-Event-Definition with {0}: {1} does not exist.','2015-02-20') ,
( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Message-Event-Definition with {0}: {1} does not is registered.','2015-02-20') ,

4
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php
View File

@@ -164,9 +164,9 @@ class Inbox extends AbstractCases
$dummyInfo = [];
if (!empty($previousThread)) {
// When the task has an user
$userInfo = ($previousThread['USR_ID'] !== 0) ? User::getInformation($previousThread['USR_ID']) : [];
$userInfo = (intval($previousThread['USR_ID']) !== 0) ? User::getInformation($previousThread['USR_ID']) : [];
// When the task does not have users refers to dummy task
$taskInfo = ($previousThread['USR_ID'] === 0) ? Task::title($previousThread['TAS_ID']) : [];
$taskInfo = (intval($previousThread['USR_ID']) === 0) ? Task::title($previousThread['TAS_ID']) : [];
if (!empty($taskInfo)) {
$dummyInfo = [
'task_id' => $previousThread['TAS_ID'],