fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1739 from luisfernandosl/FIX_SIMPLIFIED_UI

Browse Source 
FIX_SIMPLIFIED_UI "Traducciones faltantes." SOLVED
This commit is contained in:
julceslauhub
2013-05-20 07:31:36 -07:00
parent 30afc86202 0ec881a6f9
commit 0aae31e8e0
13 changed files with 114 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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_SAVED2");
}
if ($notify) {
@@ -140,10 +140,10 @@ class AppNotes extends BaseAppNotes
$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' => 'Emails', 'OBJ_UID' => '','CFG_VALUE' => '','PRO_UID' => '','USR_UID' => '','APP_UID' => '') );
$aConfiguration = array ();
} else {
$aConfiguration = $oConfiguration->load( 'Emails', '', '', '', '' );
$aConfiguration = $oConfiguration->load('Emails', '', '', '', '' );
if ($aConfiguration['CFG_VALUE'] != '') {
$aConfiguration = unserialize( $aConfiguration['CFG_VALUE'] );
$passwd = $aConfiguration['MESS_PASSWORD'];

14
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_IN_CLASS1", SYS_LANG, array("CLASS" => get_class($this))));
$e->aValidationFailures = $this->getValidationFailures();
throw ($e);
}
@@ -88,7 +88,7 @@ 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_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (PropelException $e) {
//capture invalid birthday date and replace by null
@@ -115,8 +115,8 @@ class Users extends BaseUsers
$result['USR_EMAIL'] = $oUser->getUsrEmail();
return $result;
} else {
// return $result;
throw (new Exception( "The row '" . $UsrUid . "' in table USER doesn't exist!" ));
// return $result;
throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (Exception $oError) {
throw ($oError);
@@ -141,7 +141,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 +152,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_USER_UID_DOESNT_EXIST", SYS_LANG, array("USR_UID" => $UsrUid))));
}
} catch (Exception $oError) {
throw ($oError);
@@ -172,7 +172,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_CLASS1", SYS_LANG, array("CLASS" => get_class($this)))));
}
} catch (Exception $e) {
$con->rollback();