From 5c40bc11f1aa5c883d9367f598b55b2aed28e505 Mon Sep 17 00:00:00 2001 From: Andrea Adamczyk Date: Fri, 18 Dec 2020 20:57:53 -0400 Subject: [PATCH] PMCORE-2584 --- .../js/components/search/MyCasesFilter.vue | 2 +- resources/assets/js/home/MyCases.vue | 2 +- resources/assets/js/home/Unassigned.vue | 2 +- .../translations/english/processmaker.en.po | 26 +------------------ workflow/engine/data/mysql/insert.sql | 10 +++---- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/resources/assets/js/components/search/MyCasesFilter.vue b/resources/assets/js/components/search/MyCasesFilter.vue index 131382923..4eb51725d 100644 --- a/resources/assets/js/components/search/MyCasesFilter.vue +++ b/resources/assets/js/components/search/MyCasesFilter.vue @@ -161,7 +161,7 @@ export default { optionLabel: this.$i18n.t('ID_BY_TASK'), detail: "", tagText: "", - tagPrefix: this.$i18n.t('ID_SEARCH_BY_TASK_TITLE'), + tagPrefix: this.$i18n.t('ID_SEARCH_BY_TASK_NAME'), autoShow: true, items:[ { diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue index 77de04a1d..e23c38ee9 100644 --- a/resources/assets/js/home/MyCases.vue +++ b/resources/assets/js/home/MyCases.vue @@ -102,7 +102,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), - pending_taks: this.$i18n.t("PENDING_TASKS"), + pending_taks: this.$i18n.t("ID_PENDING_TASKS"), status: this.$i18n.t("ID_CASESLIST_APP_STATUS"), start_date: this.$i18n.t("ID_START_DATE"), finish_date: this.$i18n.t("ID_FINISH_DATE"), diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index fd7c7269f..270025cbe 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -51,7 +51,7 @@
{{ props.row.PRIORITY }}
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 32213792c..4ffd23094 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -3083,6 +3083,7 @@ msgstr "By Status" msgid "By Start Date" msgstr "By Start Date" +# TRANSLATION # LABEL/ID_BY_ROLE #: LABEL/ID_BY_ROLE msgid "By Role" @@ -26350,13 +26351,6 @@ msgstr "Total Cases Reassigned" msgid "To do" msgstr "To do" - -# TRANSLATION -# LABEL/ID_TO_FINISH_DATE -#: LABEL/ID_TO_FINISH_DATE -msgid "To Finish Date (Optional)" -msgstr "To Finish Date (Optional)" - # TRANSLATION # LABEL/ID_TO_FLOAT #: LABEL/ID_TO_FLOAT @@ -26381,12 +26375,6 @@ msgstr "Reassign" msgid "Review" msgstr "Review" -# TRANSLATION -# LABEL/ID_TO_START_DATE -#: LABEL/ID_TO_START_DATE -msgid "To Start Date (Optional)" -msgstr "To Start Date (Optional)" - # TRANSLATION # LABEL/ID_TO_STRING #: LABEL/ID_TO_STRING @@ -52641,12 +52629,6 @@ msgstr "Case #" msgid "Process Name" msgstr "Process Name" -# TRANSLATION -# LABEL/ID_DURATION -#: LABEL/ID_DURATION -msgid "Duration" -msgstr "Duration" - # TRANSLATION # LABEL/ID_PENDING_TASKS #: LABEL/ID_PENDING_TASKS @@ -52666,12 +52648,6 @@ msgstr "Send email to participants" msgid "You are tying to cancel the current case. Please be aware this action cannot be undone" msgstr "You are tying to cancel the current case. Please be aware this action cannot be undone" -# TRANSLATION -# LABEL/ID_CONFIRMATION -#: LABEL/ID_CONFIRMATION -msgid "Confirmation" -msgstr "Confirmation" - # TRANSLATION # LABEL/ID_ARE_YOU_SURE_UNPAUSE_TASK #: LABEL/ID_ARE_YOU_SURE_UNPAUSE_TASK diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 072819d92..1aac17329 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -56846,7 +56846,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'JAVASCRIPT','ID_CLICK_VIEW_MORE_INFO','en','Click here to view more info','2014-01-15') , ( 'JAVASCRIPT','ID_CLOSE_SEARCH','en','Close Search','2014-01-15') , ( 'JAVASCRIPT','ID_COLOR_LEYENDS','en','Key','2014-01-15') , -( 'JAVASCRIPT','ID_CONFIRMATION','en','Confirmation','2020-12-01') , ( 'JAVASCRIPT','ID_CONFIRM_ADHOCUSER_CASE','en','Are you sure you want to do it?','2014-01-15') , ( 'JAVASCRIPT','ID_CONFIRM_CANCEL_CASE','en','Are you sure you want to cancel this case?','2014-01-15') , ( 'JAVASCRIPT','ID_CONFIRM_DELETE_CASE','en','Are you sure you want to delete this case?','2014-01-15') , @@ -56867,7 +56866,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'JAVASCRIPT','ID_DONT_SAVE_XMLFORM','en','This form has not a submit action. Do you want to continue anyway?','2014-01-15') , ( 'JAVASCRIPT','ID_DUPLICATE_CATEGORY_NAME','en','Duplicate category name.','2014-01-15') , ( 'JAVASCRIPT','ID_DYNAFORMS','en','DynaForms','2014-01-15') , -( 'JAVASCRIPT','ID_DURATION','en','Duration','2020-12-04') , ( 'JAVASCRIPT','ID_DYNAFORM_ASSIGN','en','You cannot delete this Dynaform while it is assigned to a step.','2014-01-15') , ( 'JAVASCRIPT','ID_EDIT_STAGES_MAP','en','Edit Stages Map','2014-01-15') , ( 'JAVASCRIPT','ID_EMAIL_INVALID','en','The mail is invalid','2014-01-15') , @@ -58338,7 +58336,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_FROM','en','From','2014-01-15') , ( 'LABEL','ID_FROM_EMAIL','en','Sender Email','2017-02-21') , ( 'LABEL','ID_FROM_FINISH_DATE','en','From Finish Date','2020-12-16') , -( 'LABEL','ID_FROM_NAME','en','Sender Name','2017-02-21') ; +( 'LABEL','ID_FROM_NAME','en','Sender Name','2017-02-21') , ( 'LABEL','ID_FROM_START_DATE','en','From Start Date','2020-12-16') , INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES @@ -60463,7 +60461,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PLEASE_SELECT_PLUGIN','en','Please select the plugin','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_PO_FILE','en','Please select a .po file','2014-01-15') , ( 'LABEL','ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH','en','Please select the status for the search:','2020-12-16') , -( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,ยบ +( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_START_DATE_TO_SEARCH','en','Please set a range of cases Start Date to search:','2020-12-16') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_FINISH_DATE_TO_SEARCH','en','Please set a range of cases Finish Date to search:','2020-12-16') , ( 'LABEL','ID_PLEASE_SET_A_RANGE_TO_CASES_TO_SEARCH','en','Please set a range of cases to search:','2020-12-16') , @@ -61216,7 +61214,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TASK_TITLE','en','Task Title','2020-12-17') , ( 'LABEL','ID_TASK_TRANSFER','en','Task Transfer Date','2014-01-15') , ( 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with sub-processes.
The task "{0}" from case {1} was assigned to user {2} ( {3} {4} )','2015-02-24') , -( 'LABEL','ID_TAS_DURATION_REQUIRE','en','Duration task required','2014-0f-15') , +( 'LABEL','ID_TAS_DURATION_REQUIRE','en','Duration task required','2014-04-15') , ( 'LABEL','ID_TASK_SCHEDULER','en','Task Scheduler','2014-01-15') , ( 'LABEL','ID_TASK_SCHEDULER_ACTION_EMAIL','en','Action by Email Response','2014-01-15') , ( 'LABEL','ID_TASK_SCHEDULER_ACTION_EMAIL_DESC','en','Action by email response account email revision','2014-01-15') , @@ -61350,12 +61348,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TOTAL_CASES','en','Total Cases','2014-01-15') , ( 'LABEL','ID_TOTAL_CASES_REASSIGNED','en','Total Cases Reassigned','2014-01-15') , ( 'LABEL','ID_TO_DO','en','To do','2014-01-15') , -( 'LABEL','ID_TO_FINISH_DATE','en','To Finish Date (Optional)','2020-12-16') , ( 'LABEL','ID_TO_FLOAT','en','Replace the value converted to float','2014-01-15') , ( 'LABEL','ID_TO_INTEGER','en','Replace the value converted to integer','2014-01-15') , ( 'LABEL','ID_TO_REASSIGN','en','Reassign','2014-01-15') , ( 'LABEL','ID_TO_REVISE','en','Review','2014-01-15') , -( 'LABEL','ID_TO_START_DATE','en','To Start Date (Optional)','2020-12-16') , ( 'LABEL','ID_TO_STRING','en','Replace the value in quotes','2014-01-15') , ( 'LABEL','ID_TO_URL','en','Replace the value with URL encoding','2014-01-15') , ( 'LABEL','ID_TRANSFER_HISTORY','en','Transfer History','2014-01-15') ,