From f83ba242a4570f5f1024f0cf1041249d867f089f Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 9 Jun 2017 16:40:18 -0400 Subject: [PATCH] HOR-3085 --- .../translations/english/processmaker.en.po | 25 +++++++++++++++++++ workflow/engine/data/mysql/insert.sql | 4 +++ .../methods/services/ActionsByEmail.php | 4 +-- .../services/ActionsByEmailDataForm.php | 2 +- .../services/ActionsByEmailDataFormPost.php | 2 +- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index e2dc8c93d..b335ae02e 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -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 submited. Thank you." +msgstr "The answer has been submited. 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 diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 6cede1d6e..2659d9787 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -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 submited. 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') , diff --git a/workflow/engine/methods/services/ActionsByEmail.php b/workflow/engine/methods/services/ActionsByEmail.php index e6f809ee5..c4a45f3ca 100644 --- a/workflow/engine/methods/services/ActionsByEmail.php +++ b/workflow/engine/methods/services/ActionsByEmail.php @@ -94,7 +94,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) { throw $e; } - $message = 'The answer has been submited. Thank you'; + $message = '' . G::loadTranslation('ID_ABE_ANSWER_SUBMITTED') . ''; //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 = 'The response has already been sent.'; + $message = '' . G::loadTranslation('ID_ABE_RESPONSE_SENT') . ''; } $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showInfo', '', array('MESSAGE' => $message)); diff --git a/workflow/engine/methods/services/ActionsByEmailDataForm.php b/workflow/engine/methods/services/ActionsByEmailDataForm.php index e2c2f65bf..fad879c1d 100644 --- a/workflow/engine/methods/services/ActionsByEmailDataForm.php +++ b/workflow/engine/methods/services/ActionsByEmailDataForm.php @@ -67,7 +67,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) { 'xmlform', 'login/showInfo', '', - ['MESSAGE' => 'The form has already been filled and sent.'] + ['MESSAGE' => '' . G::loadTranslation('ID_ABE_FORM_ALREADY_FILLED') . ''] ); } } catch (Exception $e) { diff --git a/workflow/engine/methods/services/ActionsByEmailDataFormPost.php b/workflow/engine/methods/services/ActionsByEmailDataFormPost.php index 7655a4d04..c351a0866 100644 --- a/workflow/engine/methods/services/ActionsByEmailDataFormPost.php +++ b/workflow/engine/methods/services/ActionsByEmailDataFormPost.php @@ -152,7 +152,7 @@ if (PMLicensedFeatures } $assign = $result['message']; - $aMessage['MESSAGE'] = 'The information was submitted. Thank you.'; + $aMessage['MESSAGE'] = '' . G::loadTranslation('ID_ABE_INFORMATION_SUBMITTED') . ''; } else { throw new Exception('An error occurred while the application was being processed.

Error code: ' . $result->status_code . '