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

Merged in bugfix/PMCORE-4046 (pull request #8633)

Browse Source 
PMCORE-4046

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Roly Gutierrez
2023-02-03 13:24:06 +00:00
committed by Julio Cesar Laura Avendaño
parent a946573e23 648a282fa5
commit 32940fd7ea
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10985,6 +10985,12 @@ msgstr "The following start hours rows are invalid:"
msgid "Invalid trigger '{TRIGGER_INDEX}'" msgid "Invalid trigger '{TRIGGER_INDEX}'"
msgstr "Invalid trigger '{TRIGGER_INDEX}'" msgstr "Invalid trigger '{TRIGGER_INDEX}'"
# TRANSLATION
# LABEL/ID_INVALID_USERNAME
#: LABEL/ID_INVALID_USERNAME
msgid "Invalid username"
msgstr "Invalid username"
# TRANSLATION # TRANSLATION
# LABEL/ID_INVALID_VALUE # LABEL/ID_INVALID_VALUE
#: LABEL/ID_INVALID_VALUE #: LABEL/ID_INVALID_VALUE

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

@@ -58694,6 +58694,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INVALID_START_HOURS','en','The following start hours rows are invalid:','2014-01-15') , ( 'LABEL','ID_INVALID_START_HOURS','en','The following start hours rows are invalid:','2014-01-15') ,
( 'LABEL','ID_INVALID_STARTING_TIME','en','Starting time','2014-01-15') , ( 'LABEL','ID_INVALID_STARTING_TIME','en','Starting time','2014-01-15') ,
( 'LABEL','ID_INVALID_TRIGGER','en','Invalid trigger ''{TRIGGER_INDEX}''','2014-01-15') , ( 'LABEL','ID_INVALID_TRIGGER','en','Invalid trigger ''{TRIGGER_INDEX}''','2014-01-15') ,
( 'LABEL','ID_INVALID_USERNAME','en','Invalid username','2023-02-02') ,
( 'LABEL','ID_INVALID_VALUE','en','Invalid value for "{0}".','2014-05-20') , ( 'LABEL','ID_INVALID_VALUE','en','Invalid value for "{0}".','2014-05-20') ,
( 'LABEL','ID_INVALID_VALUE_ARRAY','en','Invalid value for ''{0}''. It must be an array.','2014-10-21') , ( 'LABEL','ID_INVALID_VALUE_ARRAY','en','Invalid value for ''{0}''. It must be an array.','2014-10-21') ,
( 'LABEL','ID_INVALID_VALUE_BOOLEAN','en','Invalid value for ''{0}''. It must be a boolean.','2014-10-21') , ( 'LABEL','ID_INVALID_VALUE_BOOLEAN','en','Invalid value for ''{0}''. It must be a boolean.','2014-10-21') ,

3
workflow/engine/methods/users/usersAjax.php
View File

@@ -469,8 +469,7 @@ try {
if (is_array($row) || $_POST['NEW_USERNAME'] == '') { if (is_array($row) || $_POST['NEW_USERNAME'] == '') {
$color = 'red'; $color = 'red';
$img = '/images/delete.png'; $img = '/images/delete.png';
$dataVar = ['USER_ID' => $_POST['NEW_USERNAME']]; $text = G::LoadTranslation('ID_INVALID_USERNAME');
$text = G::LoadTranslation('ID_USERNAME_ALREADY_EXISTS', $dataVar);
$text = ($_POST['NEW_USERNAME'] == '') ? G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME') : $text; $text = ($_POST['NEW_USERNAME'] == '') ? G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME') : $text;
$response['exists'] = true; $response['exists'] = true;
} else { } else {