[evolvis-commits] r8411: localization of the tracker↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:41:49 CET 2011


Author: mirabilos
Date: 2011-02-24 16:41:49 +0100 (Thu, 24 Feb 2011)
New Revision: 8411

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCanned.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCategory.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFile.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactGroup.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php
Log:
localization of the tracker


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -51,6 +51,7 @@
 	 *  @return	boolean	success.
 	 */
 	function Artifact(&$ArtifactType, $data=false) {
+		global $Language;
 		$this->Error(); 
 
 		$this->ArtifactType =& $ArtifactType;
@@ -70,7 +71,7 @@
 		//	make sure this person has permission to view artifacts
 		//
 		if (!$this->ArtifactType->userCanView()) {
-			$this->setError('Artifact: Only Group Members Can View Private ArtifactTypes');
+			$this->setError($Language->getText('tracker_artifact','private_error'));
 			return false;
 		}
 
@@ -108,7 +109,8 @@
 	 *  @return id on success / false on failure.
 	 */
 	function create($category_id, $artifact_group_id, $summary, $details, $assigned_to=100, $priority=5, $monitor_email=false) {
-
+		global $Language;
+		
 		//
 		//	make sure this person has permission to add artifacts
 		//
@@ -117,7 +119,7 @@
 			//	Only admins can post/modify private artifacts
 			//
 			if (!$this->ArtifactType->userIsAdmin()) {
-				$this->setError('Artifact: Only Artifact Admins Can Modify Private ArtifactTypes');
+				$this->setError($Language->getText('tracker_artifact','error_admin_modify'));
 				return false;
 			}
 		}
@@ -131,7 +133,7 @@
 			if ($this->ArtifactType->allowsAnon()) {
 				$user=100;
 			} else {
-				$this->setError('Artifact: This ArtifactType Does Not Allow Anonymous Submissions. Please Login.');
+				$this->setError($Language->getText('tracker_artifact','error_no_anonymous'));
 				return false;
 			}
 		}
@@ -140,11 +142,11 @@
 		//	data validation
 		//
 		if (!$summary) {
-			$this->setError('Artifact: Message Summary Is Required');
+			$this->setError($Language->getText('tracker_artifact','error_summary_required'));
 			return false;
 		}
 		if (!$details) {
-			$this->setError('Artifact: Message Body Is Required');
+			$this->setError($Language->getText('tracker_artifact','error_body_required'));
 			return false;
 		}
 		if (!$assigned_to) {
@@ -192,7 +194,7 @@
 			AND submitted_by='$user'
 			AND open_date > '". (time() - 86400) ."'");
 		if ($res && db_numrows($res) > 0) {
-			$this->setError("You Attempted To Double-submit this item. Please avoid double-clicking.");
+			$this->setError($Language->getText('tracker_artifact','double_submit'));
 			db_rollback();
 			return false;
 		}
@@ -461,6 +463,7 @@
 	 *  @return false - always false - always use the getErrorMessage() for feedback
 	 */
 	function setMonitor() {
+		global $Language;
 		if (session_loggedin()) {
 
 			$user_id=user_getid();
@@ -473,7 +476,7 @@
 
 		} else {
 
-			$this->setError('SetMonitor::Valid Email Address Required');
+			$this->setError($Language->getText('tracker_artifact','error_valid_email_required'));
 			return false;
 
 		}
@@ -490,7 +493,7 @@
 				$this->setError(db_error());
 				return false;
 			} else {
-				$this->setError('Now Monitoring');
+				$this->setError($Language->getText('tracker_artifact','monitoring_activated'));
 				return false;
 			}
 		} else {
@@ -498,7 +501,7 @@
 			db_query("DELETE FROM artifact_monitor 
 				WHERE artifact_id='". $this->getID() ."' 
 				AND user_id='$user_id'");
-			$this->setError('Monitoring Deactivated');
+			$this->setError($Language->getText('tracker_artifact','monitoring_deactivated'));
 			return false;
 		}
 	}
@@ -587,8 +590,9 @@
 	 *  @return	boolean	success.
 	 */
 	function addMessage($body,$by=false,$send_followup=false) {
+		global $Language;
 		if (!$body) {
-			$this->setError('ERROR - addMessage: Missing Parameters');
+			$this->setMissingParamsError();
 			return false;
 		}
 
@@ -599,16 +603,16 @@
 				$this->setError('ERROR - Logged In User Bug Could Not Get User Object');
 				return false;
 			}
-			$body="Logged In: YES \nuser_id=$user_id\n\n".$body;
+			$body=$Language->getText('tracker_artifact','logged_in_yes')." \nuser_id=$user_id\n\n".$body;
 
 			//	we'll store this email even though it will likely never be used - 
 			//	since we have their correct user_id, we can join the USERS table to get email
 			$by=$user->getEmail();
 		} else {
-			$body="Logged In: NO \n\n".$body;
+			$body=$Language->getText('tracker_artifact','logged_in_no')." \n\n".$body;
 			$user_id=100;
 			if (!$by || !validate_email($by)) {
-				$this->setError('ERROR - addMessage: Missing Or Invalid Email Address');
+				$this->setMissingParamsError();
 				return false;
 			}
 		}
@@ -659,6 +663,7 @@
 	function update($priority,$status_id,$category_id,$artifact_group_id,$resolution_id,
 		$assigned_to,$summary,$canned_response,$details,$new_artifact_type_id) {
 
+		global $Language;
 		if (!$this->getID() 
 			|| !$assigned_to 
 			|| !$status_id 
@@ -667,7 +672,7 @@
 			|| !$resolution_id
 			|| !$canned_response 
 			|| !$new_artifact_type_id) {
-			$this->setError('Artifact: Missing required parameters to artifact::update()');
+			$this->setMissingParamsError();
 			return false;
 		}
 
@@ -679,7 +684,7 @@
 
 		//	original submitter can always modify his/her items now
 		if (!$this->ArtifactType->userIsAdmin() && ($this->getSubmittedBy() != user_getid())) {
-			$this->setError('Artifact: Update Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 
@@ -707,7 +712,7 @@
 			}
 			//	do they have perms for new ArtifactType?
 			if (!$newArtifactType->userIsAdmin()) {
-				$this->setError('Artifact: Could not move to new ArtifactType: Permission Denied');
+				$this->setPermissionDeniedError();
 				db_rollback();
 				return false;
 			}
@@ -851,7 +856,7 @@
 			return true;
 		} else {
 			//nothing changed, so cancel the transaction
-			$this->setError('Nothing Changed - Update Cancelled');
+			$this->setError($Language->getText('tracker_artifact','nothing_changed'));
 			db_rollback();
 			return false;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCanned.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCanned.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCanned.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -71,15 +71,16 @@
 	 *  @return id on success / false on failure.
 	 */
 	function create($title, $body) {
+		global $Language;
 		//
 		//	data validation
 		//
 		if (!$title || !$body) {
-			$this->setError('ArtifactCanned: name and assignee are Required');
+			$this->setError($Language->getText('artifact_canned','required_fields'));
 			return false;
 		}
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 
@@ -169,11 +170,11 @@
 	 */
 	function update($title,$body) {
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}   
 		if (!$title || !$body) {
-			$this->setError('Missing Params');
+			$this->setMissingParamsError();
 			return false;
 		}   
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCategory.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCategory.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactCategory.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -71,15 +71,17 @@
 	 *  @return id on success / false on failure.
 	 */
 	function create($name, $auto_assign_to) {
+		global $Language;
+		
 		//
 		//	data validation
 		//
 		if (!$name || !$auto_assign_to) {
-			$this->setError('ArtifactCategory: name and assignee are Required');
+			$this->setError($Language->getText('artifact_category','required_fields'));
 			return false;
 		}
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		$sql="INSERT INTO artifact_category (group_artifact_id,category_name,auto_assign_to) 
@@ -167,11 +169,11 @@
 	 */
 	function update($name,$assign_to) {
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}   
 		if (!$name || !$assign_to) {
-			$this->setError('Missing Params');
+			$this->setMissingParamsError();
 			return false;
 		}   
 		$sql="UPDATE artifact_category 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFile.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFile.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFile.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -75,6 +75,7 @@
 	 */
 	function create($filename, $filetype, $filesize, $bin_data, $description='None') {
 
+		global $Language;
 		// Some browsers don't supply mime type if they don't know it
 		if (!$filetype) {
 			// Let's be on safe side?
@@ -86,7 +87,7 @@
 		//
 		if (!$filename || !$filetype || !$filesize || !$bin_data) {
 			//echo '<P>|'.$filename.'|'.$filetype.'|'.$filesize.'|'.$bin_data.'|';
-			$this->setError('ArtifactFile: File name, type, size, and data are Required');
+			$this->setError($Language->getText('tracker_artifactfile','required_fields'));
 			return false;
 		}
 
@@ -137,7 +138,7 @@
 	 */
 	function delete() {
 		if (!$this->Artifact->ArtifactType->userIsAdmin()) {
-			$this->setError('ArtifactFile: Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		$res=db_query("DELETE FROM artifact_file WHERE id='". $this->getID() ."'");

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactGroup.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactGroup.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactGroup.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -70,15 +70,16 @@
 	 *  @return id on success / false on failure.
 	 */
 	function create($name) {
+		global $Language;
 		//
 		//	data validation
 		//
 		if (!$name) {
-			$this->setError('ArtifactGroup: name is Required');
+			$this->setError($Language->getText('tracker_artifactgroup','required_field'));
 			return false;
 		}
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		$sql="INSERT INTO artifact_group (group_artifact_id,group_name) 
@@ -154,11 +155,11 @@
 	 */
 	function update($name) {
 		if (!$this->ArtifactType->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}   
 		if (!$name) {
-			$this->setError('Missing Params');
+			$this->setMissingParamsError();
 			return false;
 		}   
 		$sql="UPDATE artifact_group

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class	2011-02-24 15:41:49 UTC (rev 8411)
@@ -111,7 +111,7 @@
 			if (!$this->isPublic()) {
 	                	$perm =& $this->Group->getPermission( session_get_user() );
 			        if (!$perm || !is_object($perm) || !$perm->isMember()) {
-	                		$this->setError('Permission Denied');
+	                		$this->setPermissionDeniedError();
 					$this->data_array = null;
 	                		return false;
 				}
@@ -138,15 +138,16 @@
 	function create($name,$description,$is_public,$allow_anon,$email_all,$email_address,
 		$due_period,$use_resolution,$submit_instructions,$browse_instructions,$datatype=0) {
 
+		global $Language;
 		$perm =& $this->Group->getPermission( session_get_user() );
 
 		if (!$perm || !is_object($perm) || !$perm->isArtifactAdmin()) {
-			$this->setError('ArtifactType: Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 
 		if (!$name || !$description || !$due_period) {
-			$this->setError('ArtifactType: Name, Description, and Due Period are required');
+			$this->setError($Language->getText('tracker_artifacttype','required_fields'));
 			return false;
 		}
 
@@ -488,11 +489,11 @@
 	 */
 	function addUser($id) {
 		if (!$this->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		if (!$id) {
-			$this->setError('Missing Params');
+			$this->setMissingParamsError();
 			return false;
 		}
 		$sql="INSERT INTO artifact_perm (group_artifact_id,user_id,perm_level) 
@@ -515,11 +516,11 @@
 	 */
 	function updateUser($id,$perm_level) {
 		if (!$this->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		if (!$id) {
-			$this->setError('Missing Params: '.$id.'|'.$perm_level);
+			$this->setMissingParamsError();
 			return false;
 		}
 		$sql="UPDATE artifact_perm SET perm_level='$perm_level'
@@ -541,11 +542,11 @@
 	 */
 	function deleteUser($id) {
 		if (!$this->userIsAdmin()) {
-			$this->setError('Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 		if (!$id) {
-			$this->setError('Missing Params');
+			$this->setMissingParamsError();
 			return false;
 		}
 		$sql="DELETE FROM artifact_perm
@@ -642,10 +643,11 @@
 	function update($name,$description,$is_public,$allow_anon,$email_all,$email_address,
 		$due_period, $status_timeout,$use_resolution,$submit_instructions,$browse_instructions) {
 
+		global $Language;
 		$perm =& $this->Group->getPermission(session_get_user());
 
 		if (!$perm || !is_object($perm) || !$perm->isArtifactAdmin()) {
-			$this->setError('ArtifactType: Permission Denied');
+			$this->setPermissionDeniedError();
 			return false;
 		}
 
@@ -655,7 +657,7 @@
 		}
 		
 		if (!$name || !$description || !$due_period || !$status_timeout) {
-			$this->setError('ArtifactType: Name, Description, Due Period, and Status Timeout are required');
+			$this->setError($Language->getText('tracker_artifacttype','required_fields'));
 			return false;
 		}
 		

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/index.php	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/admin/index.php	2011-02-24 15:41:49 UTC (rev 8411)
@@ -47,7 +47,7 @@
 		exit_error('Error','ArtifactType could not be created');
 	}
 	if ($ath->isError()) {
-		exit_error('Error',$ath->getErrorMessage());
+		exit_error($Language->getText('general','error').'',$ath->getErrorMessage());
 	}
 
 	if ($post_changes) {
@@ -65,7 +65,7 @@
 //				$feedback .= $ac->getErrorMessage();			
 			} else {
 				if (!$ac->create($name,$assign_to)) {
-					$feedback .= ' Error inserting: '.$ac->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_inserting').': '.$ac->getErrorMessage();
 					$ac->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','category_inserted');
@@ -81,7 +81,7 @@
 //				$feedback .= $ag->getErrorMessage();
 			} else {
 				if (!$ag->create($name)) {
-					$feedback .= ' Error inserting: '.$ag->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_inserting').' : '.$ag->getErrorMessage();
 					$ag->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','group_inserted');
@@ -97,7 +97,7 @@
 //				$feedback .= $acr->getErrorMessage();			
 			} else { 
 				if (!$acr->create($title,$body)) {
-					$feedback .= ' Error inserting: '.$acr->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_inserting').' : '.$acr->getErrorMessage();
 					$acr->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','canned_response_inserted');
@@ -173,7 +173,7 @@
 				$feedback .= $acr->getErrorMessage();
 			} else {
 				if (!$acr->update($title,$body)) {
-					$feedback .= ' Error updating: '.$acr->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_updating').' : '.$acr->getErrorMessage();
 					$acr->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','canned_response_updated');
@@ -191,7 +191,7 @@
 				$feedback .= $ac->getErrorMessage();
 			} else {
 				if (!$ac->update($name,$assign_to)) {
-					$feedback .= ' Error updating: '.$ac->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_updating').' : '.$ac->getErrorMessage();
 					$ac->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','category_updated');
@@ -209,7 +209,7 @@
 				$feedback .= $ag->getErrorMessage();
 			} else {
 				if (!$ag->update($name)) {
-					$feedback .= ' Error updating: '.$ag->getErrorMessage();
+					$feedback .= $Language->getText('tracker_admin','error_updating').' : '.$ag->getErrorMessage();
 					$ag->clearError();
 				} else {
 					$feedback .= $Language->getText('tracker_admin','group_updated');
@@ -222,7 +222,7 @@
 
 			if (!$ath->update($name,$description,$is_public,$allow_anon,$email_all,$email_address,
 				$due_period,$status_timeout,$use_resolution,$submit_instructions,$browse_instructions)) {
-				$feedback .= ' Error updating: '.$ath->getErrorMessage();
+				$feedback .= $Language->getText('tracker_admin','error_updating').' : '.$ath->getErrorMessage();
 				$ath->clearError();
 			} else {
 				$feedback .= $Language->getText('tracker_admin','tracker_updated');

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php	2011-02-24 15:41:48 UTC (rev 8410)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php	2011-02-24 15:41:49 UTC (rev 8411)
@@ -316,7 +316,7 @@
 			'&group_id='.$group_id.'&func=browse">' .
 			html_image("ic/tracker20w.png","20","20",array("border"=>"0")) . '  '.
 			$at_arr[$j]->getName() .'</a>
-			( <strong>'. $at_arr[$j]->getOpenCount() .' open / '. $at_arr[$j]->getTotalCount() .' total</strong> )<br />'.
+			( <strong>'. $at_arr[$j]->getOpenCount() .' '.$Language->getText('general','open').' / '. $at_arr[$j]->getTotalCount() .' '.$Language->getText('general','total').' </strong> )<br />'.
 			$at_arr[$j]->getDescription() .'<p>';
 		}
 	}



More information about the evolvis-commits mailing list