[Fusionforge-commits] FusionForge branch master updated. ad19036844d8fd119baf9b6107ca21bc1c2504c4

Alain Peyrat aljeux at fusionforge.org
Fri May 3 16:53:17 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ad19036844d8fd119baf9b6107ca21bc1c2504c4 (commit)
      from  14b7e04d09fcb04955d9409f93cd21b8f575ee81 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad19036844d8fd119baf9b6107ca21bc1c2504c4
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri May 3 16:53:06 2013 +0200

    Mostly strings changes

diff --git a/src/www/tracker/roadmap.php b/src/www/tracker/roadmap.php
index b743b75..9142c95 100644
--- a/src/www/tracker/roadmap.php
+++ b/src/www/tracker/roadmap.php
@@ -172,7 +172,7 @@ if ($group->isError()) {
 
 $atfh = new ArtifactTypeFactoryHtml($group);
 if (!$atfh || !is_object($atfh) || $atfh->isError()) {
-	exit_error(_('Error')._(': ')._('could Not Get ArtifactTypeFactoryHtml'), 'tracker');
+	exit_error(_('Error')._(': ')._('Could Not Get ArtifactTypeFactoryHtml'), 'tracker');
 }
 
 $template = getIntFromRequest('template', 0);
diff --git a/src/www/trove/TroveCategory.class.php b/src/www/trove/TroveCategory.class.php
index ca0306f..d18329b 100644
--- a/src/www/trove/TroveCategory.class.php
+++ b/src/www/trove/TroveCategory.class.php
@@ -61,14 +61,14 @@ class TroveCategory extends Error {
 			if (!$dataArray || !is_array($dataArray)) {
 				if (!$this->fetchData($categoryId)) {
 					$this->setError(_('Invalid Trove Category'),
-							_('That Trove category does not exist.').' '.db_error('SYS_DB_TROVE')
+							_('That Trove category does not exist').' '.db_error('SYS_DB_TROVE')
 					);
 				}
 			} else {
 				$this->dataArray =& $dataArray;
 			}
 		} else {
-			$this->setError(_('ERROR'), _('That Trove category does not exist.'));
+			$this->setError(_('Error'), _('That Trove category does not exist'));
 		}
 	}
 
@@ -94,7 +94,7 @@ class TroveCategory extends Error {
 		$fullName = trim($fullName);
 		$description = trim($description);
 		if(empty($shortName) || empty($fullName)) {
-			$this->setError(_('ERROR'), _('Empty strings'));
+			$this->setError(_('Error'), _('Empty strings'));
 			return false;
 		} else {
 			db_begin();
@@ -106,7 +106,7 @@ class TroveCategory extends Error {
 				WHERE trove_cat_id=$5",
 				array(htmlspecialchars($shortName), htmlspecialchars($fullName), htmlspecialchars($description), date('Ymd',time())."01", $this->categoryId));
 			if(!$result || db_affected_rows($result) != 1) {
-				$this->setError(_('ERROR'), _('Cannot update'));
+				$this->setError(_('Error'), _('Cannot update'));
 				db_rollback();
 				return false;
 			} else {
diff --git a/src/www/trove/TroveCategoryLabel.class.php b/src/www/trove/TroveCategoryLabel.class.php
index 25c9940..04d7f8b 100644
--- a/src/www/trove/TroveCategoryLabel.class.php
+++ b/src/www/trove/TroveCategoryLabel.class.php
@@ -84,6 +84,7 @@ class TroveCategoryLabel extends Error {
 		$this->labelId = db_insertid($result, 'trove_category_labels', 'label_id');
 		$this->fetchData($this->labelId);
 		db_commit();
+		return true;
 	}
 
 	function update() {
diff --git a/src/www/trove/include/trove.php b/src/www/trove/include/trove.php
index 7153bba..8aaa047 100644
--- a/src/www/trove/include/trove.php
+++ b/src/www/trove/include/trove.php
@@ -165,6 +165,7 @@ function trove_setnode($group_id,$trove_cat_id,$rootnode=0) {
  * trove_getrootcat() - Get the root categegory
  *
  * @param		int		Trove category ID
+ * @return int
  */
 function trove_getrootcat($trove_cat_id) {
 	$parent = 1;
@@ -235,6 +236,7 @@ function trove_catselectfull($node,$selected,$name) {
  * @param		int		The group ID
  * @param		bool	Whether filters have already been applied
  * @param		bool	Whether to print category links
+ * @return string
  */
 function trove_getcatlisting($group_id,$a_filter,$a_cats) {
 	global $discrim_url;
@@ -253,8 +255,8 @@ function trove_getcatlisting($group_id,$a_filter,$a_cats) {
 
 	$return = '';
 	if (db_numrows($res_trovecat) < 1) {
-		$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 />';
+		$return .= '<p>' . 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;

-----------------------------------------------------------------------

Summary of changes:
 src/www/tracker/roadmap.php                |    2 +-
 src/www/trove/TroveCategory.class.php      |    8 ++++----
 src/www/trove/TroveCategoryLabel.class.php |    1 +
 src/www/trove/include/trove.php            |    6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list