[evolvis-commits] r12642: Redo gettext migration for the trove map maintenance system

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:52:40 CET 2011


Author: mirabilos
Date: 2011-02-28 01:52:39 +0100 (Mon, 28 Feb 2011)
New Revision: 12642

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategory.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategoryLabel.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_add.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_edit.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_list.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/include/trove.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/index.php
Log:
Redo gettext migration for the trove map maintenance system

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-28 00:52:39 UTC (rev 12642)
@@ -1,5 +1,8 @@
 2009-01-13  Roland Mas  <lolando at debian.org>
 
+	* www/trove/*: Redo gettext transition that had somehow gotten
+	lost.
+
 	* plugins/wiki/www/u: Remove call to the old $Language->getText()
 	API.
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategory.class.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategory.class.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -66,16 +66,15 @@
 			$this->categoryId = $categoryId;
 			if (!$dataArray || !is_array($dataArray)) {
 				if (!$this->fetchData($categoryId)) {
-					$this->setError(
-						$Language->getText('trove_list','invalid_category_title'),
-						$Language->getText('trove_list','invalid_category_text').': '.db_error()
+					$this->setError(_('Invalid Trove Category'),
+							_('That Trove category does not exist.').' '.db_error()
 					);
 				}
 			} else {
 				$this->dataArray =& $dataArray;
 			}
 		} else {
-			$this->setError($Language->getText('global','error'), $GLOBALS['Language']->getText('admin_trove_cat_edit','no_such_category'));
+			$this->setError(_('ERROR'), _('That Trove category does not exist.'));
 		}
 	}
 	
@@ -103,7 +102,7 @@
 		$fullName = trim($fullName);
 		$description = trim($description);
 		if(empty($shortName) || empty($fullName)) {
-			$this->setError($Language->getText('general','error'), 'empty strings');
+			$this->setError(_('ERROR'), _('Empty strings'));
 			return false;
 		} else {
 			db_begin();
@@ -115,7 +114,7 @@
 				WHERE trove_cat_id='".$this->categoryId."'"
 			);
 			if(!$result || db_affected_rows($result) != 1) {
-				$this->setError($Language->getText('general','error'), 'cannot update');
+				$this->setError(_('ERROR'), _('Cannot update'));
 				db_rollback();
 				return false;
 			} else {
@@ -164,8 +163,6 @@
 			$res = db_query($sql);
 			
 			if (!$res) {
-				//$this->setError($Language->getText('general', 'error_getting', array($Language->getText('mail_common', 'mailing_list'))));
-				//return false;
 				return $this->labels;
 			}
 			while($data =& db_fetch_array($res)) {

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategoryLabel.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategoryLabel.class.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/TroveCategoryLabel.class.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -45,7 +45,6 @@
 		global $Language;
 		$this->Error();
 		if (!$category || !is_object($category)) {
-			//$this->setError($Language->getText('general', 'error_no_valid_group_object', array('MailingList')));
 			return false;
 		}
 		if ($category->isError()) {
@@ -63,7 +62,6 @@
 			} else {
 				$this->dataArray =& $dataArray;
 				if ($this->dataArray['category_id'] != $this->category->getId()) {
-					//$this->setError($Language->getText('general', 'error_group_id'));
 					$this->dataArray = null;
 					return false;
 				}
@@ -91,7 +89,6 @@
 		echo db_error();
 		if (!$result) {
 			db_rollback();
-			//$this->setError($Language->getText('general', 'error_creating', array($Language->getText('mail_common', 'mailing_list'))).db_error());
 			return false;
 		}
 		$this->labelId = db_insertid($result, 'trove_category_labels', 'label_id');
@@ -111,7 +108,6 @@
 			);
 
 		if (!$res || db_numrows($res) < 1) {
-			//$this->setError($Language->getText('general', 'error_getting', array($Language->getText('mail_common', 'mailing_list'))));
 			return false;
 		}
 		$this->dataArray =& db_fetch_array($res);

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_add.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_add.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_add.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -38,7 +38,7 @@
 
 		if (!$res || db_affected_rows($res)<1) {
 			exit_error(
-				$Language->getText('admin_trove_cat_add','error_in_trove_openration'),
+				_('Error in Trove operation'),
 				db_error()
 			);
 		}
@@ -50,13 +50,13 @@
 	session_redirect("/admin/trove/trove_cat_list.php");
 } 
 
-site_admin_header(array('title'=>$Language->getText('admin_trove_cat_add','title')));
+site_admin_header(array('title'=>_('Site Admin: Trove - Add Node')));
 ?>
 
-<h3><?php echo $Language->getText('admin_trove_cat_add','add_new_trove_category'); ?></h3>
+<h3><?php echo _('Add New Trove Category'); ?></h3>
 
 <form action="trove_cat_add.php" method="post">
-<p><?php echo $Language->getText('admin_trove_cat_add','parent_category'); ?>:<?php echo utils_requiredField(); ?>
+	<p><?php echo _('Parent Category: '); ?><?php echo utils_requiredField(); ?>
 <br /><select name="form_parent">
 
 <?php
@@ -84,13 +84,13 @@
 ?>
 
 </select></p>
-<p><?php echo $Language->getText('admin_trove_cat_add','new_category_short_name'); ?>:<?php echo utils_requiredField(); ?>
+<p><?php echo _('New category short name (no spaces, Unix-like): '); ?> <?php echo utils_requiredField(); ?>
 <br /><input type="text" name="form_shortname" /></p>
-<p><?php echo $Language->getText('admin_trove_cat_add','new_category_full_name'); ?>:<?php echo utils_requiredField(); ?>
+	<p><?php echo _('New category full name (80 characters max): '); ?> <?php echo utils_requiredField(); ?>
 <br /><input type="text" name="form_fullname" /></p>
-<p><?php echo $Language->getText('admin_trove_cat_add','new_category_description'); ?>:<?php echo utils_requiredField(); ?>
+<p><?php echo _('New category description (255 characters max): '); ?> <?php echo utils_requiredField(); ?>
 <br /><input type="text" size="80" name="form_description" />
-<br /><input type="submit" name="submit" value="<?php echo $Language->getText('admin_trove_cat_add','add'); ?>" /></p>
+<br /><input type="submit" name="submit" value="<?php echo _('Add'); ?>" /></p>
 </form>
 
 <?php

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_edit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_edit.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_edit.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -41,7 +41,7 @@
 $category = new TroveCategory($categoryId);
 
 if($category->isError()) {
-	exit_error($Language->getText('global','error'), $category->getErrorMessage());
+	exit_error(_('ERROR'), $category->getErrorMessage());
 }
 
 $do = getStringFromRequest('do');
@@ -71,111 +71,30 @@
 }
 
 /*
-if ($GLOBALS["submit"]) {
-
-	$newroot = trove_getrootcat($GLOBALS['form_parent']);
-
-	if ($GLOBALS[form_shortname]) {
-		if ($form_trove_cat_id == $form_parent) {
-			exit_error($Language->getText(
-								'admin_trove_cat_edit','error_tove_equal_parent'),
-								db_error()
-			);
-		} else {
-			$res = db_query("
-				UPDATE trove_cat
-				SET	shortname='".htmlspecialchars($form_shortname)."',
-					fullname='".htmlspecialchars($form_fullname)."',
-					description='".htmlspecialchars($form_description)."',
-					parent='$form_parent',
-					version='".date("Ymd",time())."01',
-					root_parent='$newroot'
-				WHERE trove_cat_id='$form_trove_cat_id'
-			");
-		}
-
-		if (!$res || db_affected_rows($res)<1) {
-			exit_error(
-				$Language->getText('admin_trove_cat_edit','error_in_trove_operation'),
-				db_error()
-			);
-		}
-	}
-	// update full paths now
-	if($newroot!=0) {
-		trove_genfullpaths($newroot,trove_getfullname($newroot),$newroot);
-		trove_updaterootparent($form_trove_cat_id,$newroot);
-	}
-	else {
-		trove_genfullpaths($form_trove_cat_id,trove_getfullname($form_trove_cat_id),$form_trove_cat_id);
-		trove_updaterootparent($form_trove_cat_id,$form_trove_cat_id);
-	}
-	db_query("update trove_group_link set trove_cat_root=(select root_parent from trove_cat where trove_cat_id=trove_group_link.trove_cat_id)");
-
-	session_redirect("/admin/trove/trove_cat_list.php");
-}
-
-if ($GLOBALS["delete"]) {
-	if ($form_trove_cat_id==$default_trove_cat){
-		exit_error( $Language->getText('admin_trove_cat_edit','error_in_trove_operation_cant_delete'));
-	}
-	$sql = "select count(*) from trove_group_link where trove_cat_id='$form_trove_cat_id'";
-	$res = db_numrows(db_query($sql));
-	if ($res > 0) {
-		exit_error($Language->getText('admin_trove_cat_edit','error_in_trove_operation'), $Language->getText('admin_trove_cat_edit','error_in_trove_operation_cant_delete_in_use'));
-	}
-	
-	$res = db_query("
-		SELECT trove_cat_id FROM trove_cat WHERE parent='$form_trove_cat_id'
-	");
-
-	if (!$res) {
-		exit_error( $Language->getText('admin_trove_cat_edit','error_in_trove_operation'), db_error());
-	}
-	if (db_numrows($res)>0) {
-		exit_error( $Language->getText('admin_trove_cat_edit','cant_delete_has_subcategories'), db_error());
-	} else {
-		$res=db_query(" DELETE FROM trove_treesums WHERE trove_cat_id='$form_trove_cat_id'");
-		if (!$res || db_affected_rows($res)<1) {
-			 exit_error( $Language->getText('admin_trove_cat_edit','error_in_trove_operation'), db_error());
-		}
-		$res=db_query(" DELETE FROM trove_cat WHERE trove_cat_id='$form_trove_cat_id'");
-		if (!$res || db_affected_rows($res)<1) {
-			exit_error( $Language->getText('admin_trove_cat_edit','error_in_trove_operation'), db_error());
-		}
-		$res=db_query(" DELETE FROM trove_group_link WHERE trove_cat_id='$form_trove_cat_id'");
-		if (!$res) {
-			exit_error( $Language->getText('admin_trove_cat_edit','error_in_trove_operation'), db_error());
-		}
-	}
-	session_redirect("/admin/trove/trove_cat_list.php");
-}
-*/
-/*
 	Main Code
 */
 
-site_admin_header(array('title'=>$Language->getText('admin_trove_cat_edit','title')));
+site_admin_header(array('title'=>_('Site Admin: Trove - Category List')) ;
 ?>
 
 <table width="100%" border="0">
 	<tr>
 		<td width="60%" valign="top">
-<h3><?php echo $Language->getText('admin_trove_cat_edit','edit_trove_category'); ?></h3>
+		  <h3><?php echo _('Site Admin: Trove - Edit Category'); ?></h3>
 
 <form action="trove_cat_edit.php?trove_cat_id=<?php echo $category->getId(); ?>" method="post">
 <input type="hidden" name="do" value="updateCategory" />
 
-<p><?php echo $Language->getText('admin_trove_cat_edit','new_category_short_name'); ?>:
+		  <p><?php echo _('New category short name (no spaces, Unix-like): '); ?>
 <br /><input type="text" name="shortName" value="<?php echo $category->getShortName(); ?>" /></p>
 
-<p><?php echo $Language->getText('admin_trove_cat_edit','new_category_full_name'); ?>:
+		  <p><?php echo _('New category full name (80 characters max): '); ?>
 <br /><input type="text" name="fullName" value="<?php echo $category->getFullName(); ?>" /></p>
 
-<p><?php echo $Language->getText('admin_trove_cat_edit','new_category_description'); ?>:
+		  <p><?php echo _('New category description (255 characters max): '); ?>
 <br /><input type="text" name="description" size="80" value="<?php echo $category->getDescription(); ?>" /></p>
 
-<br /><input type="submit" name="submit" value="<?php echo $Language->getText('admin_trove_cat_edit','update'); ?>" /><input type="submit" name="delete" value="<?php echo $Language->getText('admin_trove_cat_edit','delete'); ?>" />
+<br /><input type="submit" name="submit" value="<?php echo _('update'); ?>" /><input type="submit" name="delete" value="<?php echo _('delete'); ?>" />
 </form>
 <?php
 	$tableHeaders = array(
@@ -218,7 +137,7 @@
 	</form>
 <form>
 <h3>Move the category</h3>
-<p><?php echo $Language->getText('admin_trove_cat_edit','parent_category'); ?>
+		  <p><?php echo _('Parent Category: '); ?>
 <br /><select name="form_parent">
 <?php
 // generate list of possible parents

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_list.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_list.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/admin/trove_cat_list.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -31,11 +31,11 @@
 
 	print html_image('ic/cfolder15.png','15','13',array());
 	print ('  '.$text." ");
-	if ($nodeid == 0) {
-		print ('<a href="trove_cat_add.php?parent_trove_cat_id='.$nodeid.'">['.$Language->getText('admin_trove_cat_list','add').']</a> ');
-	} else {
-		print ('<a href="trove_cat_edit.php?trove_cat_id='.$nodeid.'">['.$Language->getText('admin_trove_cat_list','edit').']</a> ');
-		print ('<a href="trove_cat_add.php?parent_trove_cat_id='.$nodeid.'">['.$Language->getText('admin_trove_cat_list','add').']</a> ');
+	print (url_make_link ("trove_cat_add.php?parent_trove_cat_id='.$nodeid.'",
+			      "["._('Add')."]"));
+	if ($nodeid != 0) {
+		print (url_make_link ("trove_cat_edit.php?parent_trove_cat_id='.$nodeid.'",
+				      "["._('Edit')."]"));
 		print (help_button('trove_cat',$nodeid)."\n");
 	}
 
@@ -53,11 +53,11 @@
 
 // ########################################################
 
-site_admin_header(array('title'=>$Language->getText('admin_trove_cat_list','title')));
+site_admin_header(array('title'=>_('Site Admin: Trove - Category List')));
 
 ?>
 
-<h3><?php echo $Language->getText('admin_trove_cat_list','browse_trove_tree'); ?></h3>
+<h3><?php echo _('Browse Trove Tree'); ?></h3>
 
 <?php
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/include/trove.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/include/trove.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/include/trove.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -239,10 +239,8 @@
 
 	$return = '';
 	if (db_numrows($res_trovecat) < 1) {
-		$return .= $Language->getText('trove','not_categorized')
-			.' <a href="/softwaremap/trove_list.php">'
-			. $Language->getText('trove','title')
-			.'</a>.<p />';
+		$return .= sprintf (_('This project has not yet categorized itself in the <a href="%s">Trove Software Map</a>.'), util_make_url ('/softwaremap/trove_list.php'))
+			.'<p />';
 	} else {
 		$return .= '<ul>';
 		$need_close_ul_tag = 1;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/index.php	2011-02-28 00:52:37 UTC (rev 12641)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/trove/index.php	2011-02-28 00:52:39 UTC (rev 12642)
@@ -152,54 +152,35 @@
 // We display projects
 
 $offset = getIntFromGet('offset');
+$page = getIntFromGet('page');
 
 $projectsResult = $category->getProjects($offset);
-/*
-$res_grp = db_query("
-	SELECT * 
-	FROM trove_agg
-	$discrim_queryalias
-	WHERE trove_agg.trove_cat_id='$form_cat'
-	$discrim_queryand
-	ORDER BY trove_agg.trove_cat_id ASC, trove_agg.ranking ASC
-", $TROVE_HARDQUERYLIMIT, 0, SYS_DB_TROVE);
-echo db_error();
-$querytotalcount = db_numrows($res_grp);
-	
-// #################################################################
-// limit/offset display
 
-// no funny stuff with get vars
-
-if (!isset($page) || !is_numeric($page)) {
-	$page = 1;
-}
-
 // store this as a var so it can be printed later as well
 $html_limit = '<span style="text-align:center;font-size:smaller">';
-if ($querytotalcount == $TROVE_HARDQUERYLIMIT){
-	$html_limit .= 'More than ';
-	$html_limit .= $Language->getText('trove_list','more_than',array($querytotalcount));
-	
-	}
-$html_limit .= $Language->getText('trove_list','number_of_projects',array($querytotalcount));
+$html_limit .= sprintf (ngettext ('<strong>%d</strong> project in result set.',
+				  '<strong>%d</strong> projects in result set.',
+				  $querytotalcount),
+			$querytotalcount) ;
 
 // only display pages stuff if there is more to display
 if ($querytotalcount > $TROVE_BROWSELIMIT) {
-	$html_limit .= ' Displaying '.$TROVE_BROWSELIMIT.' per page. Projects sorted by activity ranking.<br />';
+	$html_limit .= ' ' . sprintf (ngettext ('Displaying %d project per page. Projects sorted by activity ranking.',
+						'Displaying %d projects per page. Projects sorted by activity ranking.',
+						$TROVE_BROWSELIMIT),
+				      $TROVE_BROWSELIMIT)
+		. '<br />';
 
 	// display all the numbers
 	for ($i=1;$i<=ceil($querytotalcount/$TROVE_BROWSELIMIT);$i++) {
 		$html_limit .= ' ';
-		if ($page != $i) {
-			$html_limit .= '<a href="/softwaremap/trove_list.php?form_cat='.$form_cat;
-			$html_limit .= $discrim_url.'&page='.$i;
-			$html_limit .= '">';
-		} else $html_limit .= '<strong>';
-		$html_limit .= '<'.$i.'>';
-		if ($page != $i) {
-			$html_limit .= '</a>';
-		} else $html_limit .= '</strong>';
+		$displayed_i = "<$i>" ;
+		if ($page == $i) {
+			$html_limit .= "<strong>$displayed_i</strong>" ;
+		} else {
+			$html_limit .= url_make_link ("/softwaremap/trove_list.php?form_cat=$form_cat&page=$i",
+						      $displayed_i) ;
+		}
 		$html_limit .= ' ';
 	}
 }



More information about the evolvis-commits mailing list