[Fusionforge-commits] r11284 - trunk/src/common/include

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Mon Nov 1 18:06:18 CET 2010


Author: nerville
Date: 2010-11-01 18:06:18 +0100 (Mon, 01 Nov 2010)
New Revision: 11284

Modified:
   trunk/src/common/include/Group.class.php
   trunk/src/common/include/User.class.php
Log:
more i18n

Modified: trunk/src/common/include/Group.class.php
===================================================================
--- trunk/src/common/include/Group.class.php	2010-11-01 17:05:45 UTC (rev 11283)
+++ trunk/src/common/include/Group.class.php	2010-11-01 17:06:18 UTC (rev 11284)
@@ -2839,7 +2839,7 @@
 								    array ($this->getID(),
 									   'A'));
 				if (!$users_group_res) {
-					$this->setError('Error: Enable to get users from group '. $this->getID() . ' ' .db_error());
+					$this->setError(_('Error: Enable to get users from group'). ' ' . $this->getID() . ' ' .db_error());
 					return false;
 				}
 				

Modified: trunk/src/common/include/User.class.php
===================================================================
--- trunk/src/common/include/User.class.php	2010-11-01 17:05:45 UTC (rev 11283)
+++ trunk/src/common/include/User.class.php	2010-11-01 17:06:18 UTC (rev 11284)
@@ -584,7 +584,7 @@
 						$this->getID())) ;
 
 		if (!$res) {
-			$this->setError('ERROR - Could Not Update User Object: '.db_error());
+			$this->setError(_('ERROR - Could Not Update User Object:'). ' ' .db_error());
 			db_rollback();
 			return false;
 		} else {
@@ -659,7 +659,7 @@
 
 		if ($status != 'P' && $status != 'A'
 			&& $status != 'S' && $status != 'D') {
-			$this->setError('ERROR: Invalid status value');
+			$this->setError(_('ERROR: Invalid status value'));
 			return false;
 		}
 
@@ -669,7 +669,7 @@
 					       $this->getID())) ;
 
 		if (!$res) {
-			$this->setError('ERROR - Could Not Update User Status: '.db_error());
+			$this->setError(_('ERROR - Could Not Update User Status:') . ' ' .db_error());
 			db_rollback();
 			return false;
 		} else {
@@ -1015,7 +1015,7 @@
 			$out_shells[] = chop($s);
 		}
 		if (!in_array($shell, $out_shells)) {
-			$this->setError('ERROR: Invalid Shell');
+			$this->setError(_('ERROR: Invalid Shell'));
 			return false;
 		}
 
@@ -1024,7 +1024,7 @@
 					array ($shell,
 					       $this->getID())) ;
 		if (!$res) {
-			$this->setError('ERROR - Could Not Update User Unix Shell: '.db_error());
+			$this->setError(_('ERROR - Could Not Update User Unix Shell:') . ' ' .db_error());
 			db_rollback();
 			return false;
 		} else {
@@ -1181,7 +1181,7 @@
 					array ($keys,
 					       $this->getID())) ;
 		if (!$res) {
-			$this->setError('ERROR - Could Not Update User SSH Keys');
+			$this->setError(_('ERROR - Could Not Update User SSH Keys'));
 			return false;
 		} else {
 			$this->data_array['authorized_keys'] = $keys;
@@ -1328,7 +1328,7 @@
 					       $this->getID())) ;
 
 		if (!$res || db_affected_rows($res) < 1) {
-			$this->setError('ERROR - Could Not Change User Password: '.db_error());
+			$this->setError(_('ERROR - Could Not Change User Password:') . ' ' .db_error());
 			db_rollback();
 			return false;
 		} else {




More information about the Fusionforge-commits mailing list