[Fusionforge-commits] FusionForge branch master updated. 6.0.4-940-g1713d8d

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Thu Sep 29 17:20:56 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  1713d8d6c021eb6db4972bfb9cb9c5b11a08a6e8 (commit)
       via  dee8d358d1d2fe213a80b31658bd35ff34018595 (commit)
      from  1d9dfccf803ab38b917325185aec132b172eb1be (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=1713d8d6c021eb6db4972bfb9cb9c5b11a08a6e8

commit 1713d8d6c021eb6db4972bfb9cb9c5b11a08a6e8
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Thu Sep 29 17:20:52 2016 +0200

    Translate ":" separately

diff --git a/src/www/admin/groupedit.php b/src/www/admin/groupedit.php
index 416c4b1..76daa28 100644
--- a/src/www/admin/groupedit.php
+++ b/src/www/admin/groupedit.php
@@ -183,7 +183,7 @@ printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make
 ?>
 <tr>
 <td>
-<?php echo _('Home Box:'); ?>
+<?php echo _('Home Box')._(':'); ?>
 </td>
 <td>
 <input type="text" name="form_box" value="<?php echo $group->getUnixBox(); ?>" />
@@ -193,7 +193,7 @@ printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make
 
 <tr>
 <td>
-<?php echo _('HTTP Domain:') ?>
+<?php echo _('HTTP Domain')._(':') ?>
 </td>
 <td>
 <input size="40" type="text" name="form_domain" value="<?php echo $group->getDomain(); ?>" />
@@ -202,7 +202,7 @@ printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make
 
 <tr>
 <td>
-<?php echo _('Registration Application:'); ?>
+<?php echo _('Registration Application')._(':'); ?>
 </td>
 <td>
 <?php echo $group->getRegistrationPurpose(); ?>
@@ -212,7 +212,7 @@ printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make
 if ($group->usesSCM()) {
 ?>
 <tr>
-	<td><?php echo _('SCM Box:'); ?></td>
+	<td><?php echo _('SCM Box')._(':'); ?></td>
 	<td><input size="40" type="text" name="form_scm_box" value="<?php echo $group->getSCMBox(); ?>"/></td>
 </tr>
 <?php

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dee8d358d1d2fe213a80b31658bd35ff34018595

commit dee8d358d1d2fe213a80b31658bd35ff34018595
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Thu Sep 29 16:45:14 2016 +0200

    Translate ":" separately

diff --git a/src/www/admin/approve-pending.php b/src/www/admin/approve-pending.php
index 40b5bb0..2c21391 100644
--- a/src/www/admin/approve-pending.php
+++ b/src/www/admin/approve-pending.php
@@ -193,18 +193,18 @@ while ($row_grp = db_fetch_array($res_grp)) {
 	// ########################## OTHER INFO
 
 //	print "<p><strong>" ._('Other Information')."</strong></p>";
-	print "<tr><td>" ._('Project Unix Name') . _(': '). "</td><td>".$row_grp['unix_group_name']."</td></tr>";
+	print "<tr><td>" ._('Project Unix Name') . _(':'). "</td><td>".$row_grp['unix_group_name']."</td></tr>";
 
-	print "<tr><td>" ._('Submitted Description')._(': '). "</td><td><blockquote>".$row_grp['short_description']."</blockquote></td></tr>";
+	print "<tr><td>" ._('Submitted Description')._(':'). "</td><td><blockquote>".$row_grp['short_description']."</blockquote></td></tr>";
 
-	print "<tr><td>" ._('Purpose of submission:'). "</td><td><blockquote>".$row_grp['register_purpose']."</blockquote></td></tr>";
+	print "<tr><td>" ._('Purpose of submission')._(':'). "</td><td><blockquote>".$row_grp['register_purpose']."</blockquote></td></tr>";
 
 	if ($row_grp['license']=="other") {
-		print "<tr><td>" ._('License Other')._(': '). "</td><td><blockquote>".$row_grp['license_other']."</blockquote></td></tr>";
+		print "<tr><td>" ._('License Other')._(':'). "</td><td><blockquote>".$row_grp['license_other']."</blockquote></td></tr>";
 	}
 
 	if (isset($row_grp['status_comment'])) {
-		print "<tr><td>" ._('Pending reason')._(': '). "</td><td><span class=\"important\">".$row_grp['status_comment']."</span></td></tr>";
+		print "<tr><td>" ._('Pending reason')._(':'). "</td><td><span class=\"important\">".$row_grp['status_comment']."</span></td></tr>";
 	}
 
 	$submitter = NULL ;

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

Summary of changes:
 src/www/admin/approve-pending.php | 10 +++++-----
 src/www/admin/groupedit.php       |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list