[Fusionforge-commits] FusionForge branch master updated. 6.0.4-951-g82cbcef

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Sep 30 12:55:40 CEST 2016


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  82cbcefcdb48c1f00068afbfcbc1347b0929a120 (commit)
      from  64bf19522c695b892e0a4d010d1457fb9faf6711 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=82cbcefcdb48c1f00068afbfcbc1347b0929a120

commit 82cbcefcdb48c1f00068afbfcbc1347b0929a120
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Sep 30 12:55:20 2016 +0200

    translate : and avoid double ;;

diff --git a/src/common/tracker/Artifact.class.php b/src/common/tracker/Artifact.class.php
index 9b30a73..130ab47 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -517,7 +517,7 @@ class Artifact extends FFError {
 		$res = db_query_params ('DELETE FROM artifact_extra_field_data WHERE artifact_id=$1',
 					array ($this->getID())) ;
 		if (!$res) {
-			$this->setError(_('Error deleting extra field data: ').db_error());
+			$this->setError(_('Error deleting extra field data')._(': ').db_error());
 			db_rollback();
 			return false;
 		}
@@ -528,7 +528,7 @@ class Artifact extends FFError {
 		$res = db_query_params ('DELETE FROM artifact_file WHERE artifact_id=$1',
 					array ($this->getID())) ;
 		if (!$res) {
-			$this->setError(_('Error deleting file from db: ').db_error());
+			$this->setError(_('Error deleting file from db')._(': ').db_error());
 			db_rollback();
 			ArtifactStorage::instance()->rollback();
 			return false;
@@ -536,7 +536,7 @@ class Artifact extends FFError {
 		$res = db_query_params ('DELETE FROM artifact_message WHERE artifact_id=$1',
 					array ($this->getID())) ;
 		if (!$res) {
-			$this->setError(_('Error deleting message: ').db_error());
+			$this->setError(_('Error deleting message')._(': ').db_error());
 			db_rollback();
 			ArtifactStorage::instance()->rollback();
 			return false;
@@ -544,14 +544,14 @@ class Artifact extends FFError {
 		$res = db_query_params ('DELETE FROM artifact_history WHERE artifact_id=$1',
 					array ($this->getID())) ;
 		if (!$res) {
-			$this->setError(_('Error deleting history: ').db_error());
+			$this->setError(_('Error deleting history')._(': ').db_error());
 			db_rollback();
 			ArtifactStorage::instance()->rollback();
 			return false;
 		}
 		$MonitorElementObject = new MonitorElement('artifact');
 		if (!$MonitorElementObject->clearMonitor($this->getID())) {
-			$this->setError(_('Error deleting monitor: ').db_error());
+			$this->setError(_('Error deleting monitor')._(': ').db_error());
 			db_rollback();
 			ArtifactStorage::instance()->rollback();
 			return false;
@@ -559,7 +559,7 @@ class Artifact extends FFError {
 		$res = db_query_params ('DELETE FROM artifact WHERE artifact_id=$1',
 					array ($this->getID())) ;
 		if (!$res) {
-			$this->setError(_('Error deleting artifact: ').db_error());
+			$this->setError(_('Error deleting artifact')._(': ').db_error());
 			db_rollback();
 			ArtifactStorage::instance()->rollback();
 			return false;
@@ -570,7 +570,7 @@ class Artifact extends FFError {
 				WHERE group_artifact_id=$1',
 						array ($this->getID())) ;
 			if (!$res) {
-				$this->setError(_('Error updating artifact counts: ').db_error());
+				$this->setError(_('Error updating artifact counts')._(': ').db_error());
 				db_rollback();
 				ArtifactStorage::instance()->rollback();
 				return false;
@@ -580,7 +580,7 @@ class Artifact extends FFError {
 				WHERE group_artifact_id=$1',
 						array ($this->getID())) ;
 			if (!$res) {
-				$this->setError(_('Error updating artifact counts: ').db_error());
+				$this->setError(_('Error updating artifact counts')._(': ').db_error());
 				db_rollback();
 				ArtifactStorage::instance()->rollback();
 				return false;
@@ -801,7 +801,7 @@ class Artifact extends FFError {
 			}
 		}
 		if(array_key_exists('time', $importData)){
-			$time = $importData['time'];;
+			$time = $importData['time'];
 		} else {
 			$time = time();
 		}

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

Summary of changes:
 src/common/tracker/Artifact.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list