[Fusionforge-commits] FusionForge branch master updated. e1e8257621105710ceb7ad43a376ec0f5662643d

Alain Peyrat aljeux at fusionforge.org
Fri May 3 16:10:43 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  e1e8257621105710ceb7ad43a376ec0f5662643d (commit)
       via  ddb7569c2fea777607ef8143fbccc49867901c52 (commit)
       via  0e76ca9d18ade20bc975810851047d8b42af103d (commit)
      from  1ff6930c15871e03af4a20643af14c58d9b5b2be (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 e1e8257621105710ceb7ad43a376ec0f5662643d
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri May 3 16:09:34 2013 +0200

    Drop unsused variable

diff --git a/src/www/people/people_utils.php b/src/www/people/people_utils.php
index fa1f493..2ca277f 100644
--- a/src/www/people/people_utils.php
+++ b/src/www/people/people_utils.php
@@ -105,7 +105,7 @@ VALUES ($1, $2, $3, $4)", array(user_getid() ,$skill_id, $skill_level_id, $skill
 				$feedback .= _('Added to skill inventory');
 			}
 		} else {
-			$error_msg .= _('ERROR - skill already in your inventory');
+			$error_msg .= _('Error: skill already in your inventory');
 		}
 		}
 	} else {
@@ -213,7 +213,7 @@ VALUES ($1, $2, $3, $4)', array($job_id, $skill_id, $skill_level_id, $skill_year
 				$feedback .= _('Added to skill inventory');
 			}
 		} else {
-			$feedback .= _('ERROR - skill already in your inventory');
+			$feedback .= _('Error: skill already in your inventory');
 		}
 
 	} else {
@@ -230,7 +230,6 @@ AND people_skill.skill_id=people_job_inventory.skill_id
 AND people_job_inventory.job_id=$1', array($job_id));
 
 	$title_arr=array();
-	$title_arr=array();
 	$title_arr[]=_('Skill');
 	$title_arr[]=_('Level');
 	$title_arr[]=_('Experience');

commit ddb7569c2fea777607ef8143fbccc49867901c52
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri May 3 16:08:51 2013 +0200

    Rename: Tasks Admin => Tasks Administration

diff --git a/src/www/project/admin/tools.php b/src/www/project/admin/tools.php
index dc3524c..8aad5de 100644
--- a/src/www/project/admin/tools.php
+++ b/src/www/project/admin/tools.php
@@ -323,7 +323,7 @@ if($group->usesMail()) { ?>
 	<p><a href="/mail/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Mailing Lists Admin') ?></a></p>
 <?php }
 if($group->usesPM()) { ?>
-	<p><a href="/pm/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Tasks Admin') ?></a></p>
+	<p><a href="/pm/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Tasks Administration') ?></a></p>
 <?php }
 if($group->usesDocman()) { ?>
 	<p><a href="/docman/?group_id=<?php echo $group->getID(); ?>&view=admin"><?php echo _('Documents Admin') ?></a></p>

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

    Rename: developer => member, more generic

diff --git a/src/www/project/memberlist.php b/src/www/project/memberlist.php
index 883f8b8..3a0341f 100644
--- a/src/www/project/memberlist.php
+++ b/src/www/project/memberlist.php
@@ -34,7 +34,7 @@ if (!$group_id && $form_grp) {
 
 site_project_header(array('title'=>_('Project Member List'),'group'=>$group_id,'toptab'=>'memberlist'));
 
-echo '<p>' . _('If you would like to contribute to this project by becoming a developer, contact one of the project admins, designated in bold text below.') . '</p>';
+echo '<p>' . _('If you would like to contribute to this project by becoming a member, contact one of the project admins, designated in bold text below.') . '</p>';
 
 // beginning of the user descripion block
 $project =& group_get_object($group_id);

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

Summary of changes:
 src/www/people/people_utils.php |    5 ++---
 src/www/project/admin/tools.php |    2 +-
 src/www/project/memberlist.php  |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list