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

Merged in norah/processmaker/BUG-12021 (pull request #900)

Browse Source 
12021- ADD TRANSLATIONS
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-13 12:30:21 -04:00
parent 6431e15f55 be4c4b5453
commit 8782d6da93
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/setup/auditLog.php
View File

@@ -43,7 +43,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )),
array ("BuildCache", G::LoadTranslation( "ID_BUILD_CACHE" )), array ("BuildCache", G::LoadTranslation( "ID_BUILD_CACHE" )),
array ("ClearCache", G::LoadTranslation( "ID_CLEAR_CACHE" )), array ("ClearCache", G::LoadTranslation( "ID_CLEAR_CACHE" )),
array ("ClearCron", G::LoadTranslation( "ID_CLEAR_CRON" )), array ("ClearCron", G::LoadTranslation( "ID_CLEAR_CRON" )),
array ("UpdateEnvironmentSettings", G::LoadTranslation( "ID_UPDATE_ENVIRONMENTS_SETTINGS" )), array ("UpdateEnvironmentSettings", G::LoadTranslation( "ID_UPDATE_ENVIRONMENT_SETTINGS" )),
array ("UpdateLoginSettings", G::LoadTranslation( "ID_UPDATE_LOGIN_SETTINGS" )), array ("UpdateLoginSettings", G::LoadTranslation( "ID_UPDATE_LOGIN_SETTINGS" )),
array ("EnableHeartBeat", G::LoadTranslation( "ID_ENABLE_HEART_BEAT" )), array ("EnableHeartBeat", G::LoadTranslation( "ID_ENABLE_HEART_BEAT" )),
array ("DisableHeartBeat", G::LoadTranslation( "ID_DISABLE_HEART_BEAT" )), array ("DisableHeartBeat", G::LoadTranslation( "ID_DISABLE_HEART_BEAT" )),
@@ -79,6 +79,7 @@ $arrayAction = array (array ("ALL", G::LoadTranslation( "ID_ALL" )),
array ("UploadLogo", G::LoadTranslation( "ID_UPLOAD_LOGO" )), array ("UploadLogo", G::LoadTranslation( "ID_UPLOAD_LOGO" )),
array ("DeleteLogo", G::LoadTranslation( "ID_DELETE_LOGO" )), array ("DeleteLogo", G::LoadTranslation( "ID_DELETE_LOGO" )),
array ("RestoreLogo", G::LoadTranslation( "ID_RESTORE_LOGO" )), array ("RestoreLogo", G::LoadTranslation( "ID_RESTORE_LOGO" )),
array ("ReplaceLogo", G::LoadTranslation( "ID_REPLACE_LOGO" )),
array ("InstallPlugin", G::LoadTranslation( "ID_INSTALL_PLUGIN" )), array ("InstallPlugin", G::LoadTranslation( "ID_INSTALL_PLUGIN" )),
array ("EnablePlugin", G::LoadTranslation( "ID_ENABLE_PLUGIN" )), array ("EnablePlugin", G::LoadTranslation( "ID_ENABLE_PLUGIN" )),
array ("DisablePlugin", G::LoadTranslation( "ID_DISABLE_PLUGIN" )), array ("DisablePlugin", G::LoadTranslation( "ID_DISABLE_PLUGIN" )),

2
workflow/engine/methods/setup/auditLogConfigAjax.php
View File

@@ -15,11 +15,11 @@ switch ($_GET['action']) {
$response->enable = true; $response->enable = true;
G::auditLog("EnableAuditLog"); G::auditLog("EnableAuditLog");
} else { } else {
G::auditLog("DisableAuditLog");
$oServerConf->setAuditLogProperty( 'AL_OPTION', 0, SYS_SYS ); $oServerConf->setAuditLogProperty( 'AL_OPTION', 0, SYS_SYS );
$oServerConf->unsetAuditLogProperty( 'AL_NEXT_DATE', SYS_SYS ); $oServerConf->unsetAuditLogProperty( 'AL_NEXT_DATE', SYS_SYS );
$oServerConf->setAuditLogProperty( 'AL_TYPE', 'endaudit', SYS_SYS ); $oServerConf->setAuditLogProperty( 'AL_TYPE', 'endaudit', SYS_SYS );
$response->enable = false; $response->enable = false;
G::auditLog("DisableAuditLog");
} }
$response->success = true; $response->success = true;