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

Merged in feature/HOR-3085 (pull request #5733)

Browse Source 
HOR-3085

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-08-01 15:31:33 +00:00
committed by Julio Cesar Laura Avendaño
parent cccd79d983 2ae466385c
commit 3e659921fd
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4585,6 +4585,31 @@ msgstr "The cache directory is empty"
msgid "Case Id"
msgstr "Case Id"
# TRANSLATION
# LABEL/ID_ABE_FORM_ALREADY_FILLED
#: LABEL/ID_ABE_FORM_ALREADY_FILLED
msgid "The form has already been filled and sent."
msgstr "The form has already been filled and sent."
# TRANSLATION
# LABEL/ID_ABE_INFORMATION_SUBMITTED
#: LABEL/ID_ABE_INFORMATION_SUBMITTED
msgid "The information was submitted. Thank you."
msgstr "The information was submitted. Thank you."
# TRANSLATION
# LABEL/ID_ABE_ANSWER_SUBMITTED
#: LABEL/ID_ABE_ANSWER_SUBMITTED
msgid "The answer has been submitted. Thank you."
msgstr "The answer has been submitted. Thank you."
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_SENT
#: LABEL/ID_ABE_RESPONSE_SENT
msgid "The response has already been sent."
msgstr "The response has already been sent."
# TRANSLATION
# LABEL/ID_CASESLIST_DEL_INDEX
#: LABEL/ID_CASESLIST_DEL_INDEX

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

@@ -2215,6 +2215,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CLEAR_CACHE_MSG1','en','All cache data was deleted','2014-01-15') ,
( 'LABEL','ID_CLEAR_CACHE_MSG2','en','The cache directory is empty','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_UID','en','Case Id','2014-01-15') ,
( 'LABEL','ID_ABE_FORM_ALREADY_FILLED','en','The form has already been filled and sent.','2017-06-09') ,
( 'LABEL','ID_ABE_INFORMATION_SUBMITTED','en','The information was submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_ANSWER_SUBMITTED','en','The answer has been submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_RESPONSE_SENT','en','The response has already been sent.','2017-06-19') ,
( 'LABEL','ID_CASESLIST_DEL_INDEX','en','Case Index','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_NUMBER','en','#','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_STATUS','en','Status','2014-01-15') ,

4
workflow/engine/methods/services/ActionsByEmail.php
View File

@@ -94,7 +94,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
throw $e;
}
$message = '<strong>The answer has been submited. Thank you</strong>';
$message = '<strong>' . G::loadTranslation('ID_ABE_ANSWER_SUBMITTED') . '</strong>';
//Save Cases Notes
G::LoadClass('actionsByEmailUtils');
@@ -115,7 +115,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
$dataAbeRequests['ABE_REQ_ANSWERED'] = 1;
$code == 0 ? uploadAbeRequest($dataAbeRequests) : '';
} else {
$message = '<strong>The response has already been sent.</strong>';
$message = '<strong>' . G::loadTranslation('ID_ABE_RESPONSE_SENT') . '</strong>';
}
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showInfo', '', array('MESSAGE' => $message));

2
workflow/engine/methods/services/ActionsByEmailDataForm.php
View File

@@ -67,7 +67,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
'xmlform',
'login/showInfo',
'',
['MESSAGE' => '<strong>The form has already been filled and sent.</strong>']
['MESSAGE' => '<strong>' . G::loadTranslation('ID_ABE_FORM_ALREADY_FILLED') . '</strong>']
);
}
} catch (Exception $e) {

2
workflow/engine/methods/services/ActionsByEmailDataFormPost.php
View File

@@ -152,7 +152,7 @@ if (PMLicensedFeatures
}
$assign = $result['message'];
$aMessage['MESSAGE'] = '<strong>The information was submitted. Thank you.</strong>';
$aMessage['MESSAGE'] = '<strong>' . G::loadTranslation('ID_ABE_INFORMATION_SUBMITTED') . '</strong>';
} else {
throw new Exception('An error occurred while the application was being processed.<br /><br />
Error code: ' . $result->status_code . '<br />