diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php index 3e5d9ae39..9f870f9ea 100644 --- a/workflow/engine/classes/class.consolidatedCases.php +++ b/workflow/engine/classes/class.consolidatedCases.php @@ -24,7 +24,7 @@ class ConsolidatedCases return true; } if ($this->existTable && $Status) { - throw (new \Exception(\G::LoadTranslation("ID_TABLE_ALREADY_EXISTS"))); + throw (new \Exception(\G::LoadTranslation("ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS"))); } if ($RepTabUid != '') { diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 0c864bcf9..c6f0c90f5 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1465,6 +1465,12 @@ msgstr "Please enter the required fields" msgid "Table already exists" msgstr "Table already exists" +# TRANSLATION +# LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS +#: LABEL/ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS +msgid "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration." +msgstr "The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration." + # TRANSLATION # LABEL/ID_LANGUAGES #: LABEL/ID_LANGUAGES diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 963987dd8..2f96e7128 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -1684,6 +1684,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PLEASE_ENTER_REQUIRED_FIELDS','en','Please enter the required fields','2014-01-15') , ( 'LABEL','ID_TABLE_ALREADY_EXISTS','en','Table already exists','2014-01-15') , +( 'LABEL','ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS','en','The specified batch routing table already exists. The existing table will be used to store the batch routing information. Please be sure that the table has the correct batch routing configuration.','2017-03-27') , ( 'LABEL','ID_LANGUAGES','en','Language','2014-01-15') , ( 'LABEL','ID_EXPORT','en','Export','2014-01-15') , ( 'LABEL','ID_MSG_CONFIRM_REMOVE_LANGUAGE','en','Are you sure you want to remove this language?','2014-01-15') , diff --git a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml index a86daff32..86bb87b04 100644 --- a/workflow/engine/xmlform/tasks/tasks_Consolidated.xml +++ b/workflow/engine/xmlform/tasks/tasks_Consolidated.xml @@ -69,7 +69,7 @@ case 1: tableName.failed(); - if(confirm("The table name already exists\n\nDo you want to overwrite the table?")) { + if(confirm("@G::LoadTranslation(ID_BATCH_ROUTING_TABLE_ALREADY_EXISTS)")) { conSaveProperties(1); } break;