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

FIX_SIMPLIFIED_UI "Traducciones faltantes." SOLVED

Browse Source 
- Se han agragado traducciones faltantes en directorio: templates/home/ y los archivos: home.php, Users.php,
  AppNotes.php y appProxy.php
* Available from version ProcessMaker-2.0.47 (2.5.1)
This commit is contained in:
Luis Fernando Saisa Lopez
2013-05-16 20:48:16 +00:00
parent 7f1f73ae06
commit 870afbac27
13 changed files with 121 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/model/AppNotes.php
View File

@@ -102,11 +102,11 @@ class AppNotes extends BaseAppNotes
//return array ( 'codError' => -100, 'rowsAffected' => 0, 'message' => $msg );
}
if ($msg != "") {
$response['success'] = 'failure';
$response['success'] = G::LoadTranslation("ID_FAILURE");
$response['message'] = $msg;
} else {
$response['success'] = 'success';
$response['message'] = 'Saved...';
$response['success'] = G::LoadTranslation("ID_SUCCESS");
$response['message'] = G::LoadTranslation("ID_SAVEDS");
}
if ($notify) {
@@ -134,16 +134,16 @@ class AppNotes extends BaseAppNotes
$oConfiguration = new Configuration();
$sDelimiter = DBAdapter::getStringDelimiter();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( ConfigurationPeer::CFG_UID, 'Emails' );
$oCriteria->add( ConfigurationPeer::CFG_UID, G::LoadTranslation("ID_EMAILSS"));
$oCriteria->add( ConfigurationPeer::OBJ_UID, '' );
$oCriteria->add( ConfigurationPeer::PRO_UID, '' );
$oCriteria->add( ConfigurationPeer::USR_UID, '' );
$oCriteria->add( ConfigurationPeer::APP_UID, '' );
if (ConfigurationPeer::doCount( $oCriteria ) == 0) {
$oConfiguration->create( array ('CFG_UID' => 'Emails','OBJ_UID' => '','CFG_VALUE' => '','PRO_UID' => '','USR_UID' => '','APP_UID' => '') );
$oConfiguration->create( array ('CFG_UID' => G::LoadTranslation("ID_EMAILSS"), 'OBJ_UID' => '','CFG_VALUE' => '','PRO_UID' => '','USR_UID' => '','APP_UID' => '') );
$aConfiguration = array ();
} else {
$aConfiguration = $oConfiguration->load( 'Emails', '', '', '', '' );
$aConfiguration = $oConfiguration->load( G::LoadTranslation("ID_EMAILSS"), '', '', '', '' );
if ($aConfiguration['CFG_VALUE'] != '') {
$aConfiguration = unserialize( $aConfiguration['CFG_VALUE'] );
$passwd = $aConfiguration['MESS_PASSWORD'];

15
workflow/engine/classes/model/Users.php
View File

@@ -52,7 +52,7 @@ class Users extends BaseUsers
if ($this->validate()) {
$result = $this->save();
} else {
$e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
$e = new Exception( G::LoadTranslation("ID_FAILED_VALIDATION_CLASS") . get_class( $this ) . "." );
$e->aValidationFailures = $this->getValidationFailures();
throw ($e);
}
@@ -88,12 +88,13 @@ class Users extends BaseUsers
$this->setNew( false );
return $aFields;
} else {
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
throw (new Exception( G::LoadTranslation("ID_THE_ROW") ." '" . $UsrUid . "' ". G::LoadTranslation("ID_TABLE_USER_DOESNT_EXIST")));
}
} catch (PropelException $e) {
//capture invalid birthday date and replace by null
$msg = $e->getMessage();
if (strpos( 'Unable to parse value of [usr_birthday]', $msg ) != - 1) {
//if (strpos( 'Unable to parse value of [usr_birthday]', $msg ) != - 1) {
if (strpos( G::LoadTranslation("ID_UNABLE_PARSE_VALUE_URS_BIRTHDAY"), $msg ) != - 1) {
$oRow->setUsrBirthday( null );
$oRow->save();
return $this->load( $UsrUid );
@@ -116,7 +117,7 @@ class Users extends BaseUsers
return $result;
} else {
// return $result;
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
throw (new Exception( G::LoadTranslation("ID_THE_ROW") ." '" . $UsrUid . "' ". G::LoadTranslation("ID_TABLE_USER_DOESNT_EXIST")));
}
} catch (Exception $oError) {
throw ($oError);
@@ -141,7 +142,7 @@ class Users extends BaseUsers
$aFields["USR_COUNTRY_NAME"] = (!empty($aIsoCountry["IC_NAME"]))? $aIsoCountry["IC_NAME"] : "";
$aFields["USR_CITY_NAME"] = (!empty($aIsoSubdivision["IS_NAME"]))? $aIsoSubdivision["IS_NAME"] : "";
$aFields["USR_LOCATION_NAME"] = (!empty($aIsoLocation["IL_NAME"]))? $aIsoLocation["IL_NAME"] : "";
require_once PATH_RBAC . "model/Roles.php";
$roles = new Roles();
$role = $roles->loadByCode($aFields['USR_ROLE']);
@@ -152,7 +153,7 @@ class Users extends BaseUsers
return $result;
} else {
//return $result;
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
throw (new Exception( G::LoadTranslation("ID_THE_ROW") ." '" . $UsrUid . "' ". G::LoadTranslation("ID_TABLE_USER_DOESNT_EXIST")));
}
} catch (Exception $oError) {
throw ($oError);
@@ -172,7 +173,7 @@ class Users extends BaseUsers
return $result;
} else {
$con->rollback();
throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
throw (new Exception(G::LoadTranslation("ID_FAILED_VALIDATION_IN_CLASS") . get_class( $this ) . "." ));
}
} catch (Exception $e) {
$con->rollback();