[Fusionforge-commits] FusionForge branch master updated. 7c36232b69fc9bc1fd5abb585cebaf16e38f0ea4

Marc-Etienne VARGENAU vargenau at fusionforge.org
Tue Dec 24 17:39:56 CET 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  7c36232b69fc9bc1fd5abb585cebaf16e38f0ea4 (commit)
      from  70344fe2221623997867f683837bf50afe2f8a2b (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 7c36232b69fc9bc1fd5abb585cebaf16e38f0ea4
Author: vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Tue Dec 24 17:39:35 2013 +0100

    Translate ':'

diff --git a/src/common/tracker/actions/admin-ind.php b/src/common/tracker/actions/admin-ind.php
index d73e621..581085c 100644
--- a/src/common/tracker/actions/admin-ind.php
+++ b/src/common/tracker/actions/admin-ind.php
@@ -136,24 +136,24 @@ if (forge_check_perm ('tracker_admin', $group->getID())) { ?>
 	<?php echo _('<strong> Name:</strong> (examples: meeting minutes, test results, RFP Docs)') ?><br />
 	<input type="text" name="name" value="" /></p>
 	<p>
-	<strong><?php echo _('Description') ?>:</strong><br />
+	<strong><?php echo _('Description')._(':'); ?></strong><br />
 	<input type="text" name="description" value="" size="50" /></p>
 	<p>
-	<strong><?php echo _('Send email on new submission to address') ?>:</strong><br />
+	<strong><?php echo _('Send email on new submission to address')._(':'); ?></strong><br />
 	<input type="text" name="email_address" value="" /></p>
 	<p>
 	<input type="checkbox" name="email_all" value="1" /> <strong><?php echo _('Send email on all changes') ?></strong></p>
 	<p>
-	<strong><?php echo _('Days till considered overdue') ?>:</strong><br />
+	<strong><?php echo _('Days till considered overdue')._(':'); ?></strong><br />
 	<input type="text" name="due_period" value="30" /></p>
 	<p>
-	<strong><?php echo _('Days till pending tracker items time out') ?>:</strong><br />
+	<strong><?php echo _('Days till pending tracker items time out')._(':'); ?></strong><br />
 	<input type="text" name="status_timeout" value="14" /></p>
 	<p>
-	<strong><?php echo _('Free form text for the “Submit New” page') ?>:</strong><br />
+	<strong><?php echo _('Free form text for the “Submit New” page')._(':'); ?></strong><br />
 	<textarea name="submit_instructions" rows="10" cols="55"></textarea></p>
 	<p>
-	<strong><?php echo _('Free form text for the Browse page') ?>:</strong><br />
+	<strong><?php echo _('Free form text for the Browse page')._(':'); ?></strong><br />
 	<textarea name="browse_instructions" rows="10" cols="55"></textarea></p>
 	<p>
 	<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" /></p>
diff --git a/src/common/tracker/actions/mod-limited.php b/src/common/tracker/actions/mod-limited.php
index d3c957a..1e169a5 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -83,7 +83,7 @@ if (session_loggedin()) {
 <?php } ?>
 <table width="80%">
 	<tr>
-		<td><strong><?php echo _('Submitted by') ?>:</strong><br />
+		<td><strong><?php echo _('Submitted by')._(':'); ?></strong><br />
 			<?php
 			echo $ah->getSubmittedRealName();
 			if($ah->getSubmittedBy() != 100) {
@@ -93,13 +93,13 @@ if (session_loggedin()) {
 				(<tt><?php echo util_make_link_u ($submittedUnixName,$submittedBy,$submittedUnixName); ?></tt>)
 			<?php } ?>
 		</td>
-		<td><strong><?php echo _('Date Submitted') ?>:</strong><br />
+		<td><strong><?php echo _('Date Submitted')._(':'); ?></strong><br />
 		<?php
 		echo date(_('Y-m-d H:i'), $ah->getOpenDate() );
 
 		$close_date = $ah->getCloseDate();
 		if ($ah->getStatusID()==2 && $close_date > 1) {
-			echo '<br /><strong>'._('Date Closed').':</strong><br />'
+			echo '<br /><strong>'._('Date Closed')._(':').'</strong><br />'
 				 .date(_('Y-m-d H:i'), $close_date);
 		}
 		?>
@@ -111,12 +111,12 @@ if (session_loggedin()) {
 	?>
 
 	<tr>
-		<td><strong><?php echo _('Assigned to')?>:</strong><br />
+		<td><strong><?php echo _('Assigned to')._(':'); ?></strong><br />
 		<span id="tracker-assigned_to" title="<?php echo html_get_tooltip_description('assigned_to') ?>">
 		<?php echo $ah->getAssignedRealName(); ?> (<?php echo $ah->getAssignedUnixName(); ?>)
 		</span></td>
 		<td>
-		<strong><?php echo _('Priority') ?>:</strong><br />
+		<strong><?php echo _('Priority')._(':'); ?></strong><br />
 		<span id="tracker-priority" title="<?php echo html_get_tooltip_description('priority') ?>">
 		<?php echo $ah->getPriority(); ?>
 		</span></td>
@@ -125,7 +125,7 @@ if (session_loggedin()) {
 	<?php if (!$ath->usesCustomStatuses()) { ?>
 	<tr>
 		<td>
-			<strong><?php echo _('State') ?>:</strong><br />
+			<strong><?php echo _('State')._(':'); ?></strong><br />
 			<span id="tracker-status_id" title="<?php echo util_html_secure(html_get_tooltip_description('status_id')) ?>">
 			<?php echo $ath->statusBox ('status_id', $ah->getStatusID() ); ?>
 			<span>
@@ -139,7 +139,7 @@ if (session_loggedin()) {
 		$ath->renderFiles($group_id, $ah);
 	?>
 	<tr>
-		<td colspan="2"><strong><?php echo _('Summary')?><?php echo utils_requiredField(); ?>:</strong><br />
+		<td colspan="2"><strong><?php echo _('Summary')._(':'); ?><?php echo utils_requiredField(); ?></strong><br />
 			<span id="tracker-summary" title="<?php echo html_get_tooltip_description('summary') ?>">
 			<?php echo $ah->getSummary(); ?>
 			</span>
@@ -175,17 +175,17 @@ $count=count($file_list);
 $nb = $count? ' ('.$count.')' : '';
 ?>
 <div class="tabbertab" title="<?php echo _('Attachments').$nb; ?>">
-<h2><?php echo _('Existing Files') ?>:</h2>
+<h2><?php echo _('Existing Files')._(':'); ?></h2>
 <table width="80%">
 	<tr><td colspan="2">
-		<?php echo _('Attach Files') ?>: <?php echo('('._('max upload size: '.human_readable_bytes(util_get_maxuploadfilesize())).')') ?><br />
+		<?php echo _('Attach Files')._(':'); ?> <?php echo('('._('max upload size: '.human_readable_bytes(util_get_maxuploadfilesize())).')') ?><br />
 		<input type="file" name="input_file0" size="30" /><br />
 		<input type="file" name="input_file1" size="30" /><br />
 		<input type="file" name="input_file2" size="30" /><br />
 		<input type="file" name="input_file3" size="30" /><br />
 		<input type="file" name="input_file4" size="30" />
 		<p>
-		<h2><?php echo _('Attached Files') ?>:</h2>
+		<h2><?php echo _('Attached Files')._(':'); ?></h2>
 		<?php
 		//
 		// print a list of files attached to this Artifact
diff --git a/src/common/tracker/actions/query.php b/src/common/tracker/actions/query.php
index d527008..fa1a604 100644
--- a/src/common/tracker/actions/query.php
+++ b/src/common/tracker/actions/query.php
@@ -369,11 +369,11 @@ if (forge_check_perm ('tracker', $ath->getID(), 'manager')) {
 echo '
 	<tr>
 		<td colspan="2" style="white-space: nowrap;">'.
-		'<strong>'._('Last Modified Date range').':</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
+		'<strong>'._('Last Modified Date range')._(':').'</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
 		<input type="text" name="_moddaterange" size="21" maxlength="21" value="'. htmlspecialchars($_moddaterange) .'" /><p/>
-		<strong>'._('Open Date range').':</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
+		<strong>'._('Open Date range')._(':').'</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
 		<input type="text" name="_opendaterange" size="21" maxlength="21" value="'. htmlspecialchars($_opendaterange) .'" /><p/>
-		<strong>'._('Close Date range').':</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
+		<strong>'._('Close Date range')._(':').'</strong> <i>(YYYY-MM-DD YYYY-MM-DD Format)</i><br />
 		<input type="text" name="_closedaterange" size="21" maxlength="21" value="'. htmlspecialchars($_closedaterange) .'" />
 		</td>
 	</tr>
diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index 47bf2f6..8f071a8 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -212,7 +212,7 @@ function hide_edit_button(id) {
 <table class="fullwidth">
 	<tr>
 		<td colspan="2">
-		<h2><?php echo _('Changes') ?>:</h2>
+		<h2><?php echo _('Changes')._(':'); ?></h2>
 		<?php
 		$current = '';
 		$end = '';
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php b/src/common/tracker/include/ArtifactTypeHtml.class.php
index bb46936..d4649e3 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -367,7 +367,7 @@ class ArtifactTypeHtml extends ArtifactType {
 
 		if ($count > 0) {
 			echo '<tr><td colspan="2">';
-			echo '<b>'._("Attachments").':</b>'.'<br/>';
+			echo '<b>'._("Attachments")._(':').'</b>'.'<br/>';
 			$title_arr=array();
 			$title_arr[] = _('Size');
 			$title_arr[] = _('Name');
diff --git a/src/common/tracker/include/build_submission_form.php b/src/common/tracker/include/build_submission_form.php
index d50a453..a927b2a 100644
--- a/src/common/tracker/include/build_submission_form.php
+++ b/src/common/tracker/include/build_submission_form.php
@@ -42,7 +42,7 @@ function artifact_submission_form($ath, $group) {
 	if (!session_loggedin()) {
 		echo '<div class="login_warning_msg">
 		<span class="warning_msg">'.sprintf(_('Please %1$s login %2$s'), '<a href="'.util_make_url ('/account/login.php?return_to='.urlencode(getStringFromServer('REQUEST_URI'))).'">', '</a>').'</span><br />
-		'._('If you <strong>cannot</strong> login, then enter your email address here').':<p>
+		'._('If you <strong>cannot</strong> login, then enter your email address here')._(':').'<p>
 		<input type="text" name="user_email" size="50" maxlength="255" /></p>
 		</div>';
 	}
@@ -59,7 +59,7 @@ function artifact_submission_form($ath, $group) {
 
 	if (forge_check_perm ('tracker', $ath->getID(), 'manager')) {
 		echo '<tr>
-		<td><strong>'._('Assigned to').':</strong><br />';
+		<td><strong>'._('Assigned to')._(':').'</strong><br />';
 		echo $ath->technicianBox('assigned_to');
 		echo ' '.util_make_link ('/tracker/admin/?group_id='.$group->getID().'&atid='.$ath->getID().'&update_users=1', '('._('Admin').')' );
 
@@ -103,7 +103,7 @@ function artifact_submission_form($ath, $group) {
 		<div class="file_attachments">
 		<a href="javascript:help_window(\''. util_make_url ('/help/tracker.php?helpname=attach_file') .'\')"><strong>(?)</strong></a>
 		<p>
-		<strong><?php echo _('Attach Files'); ?> :</strong> <?php echo('('._('max upload size: '.human_readable_bytes(util_get_maxuploadfilesize())).')') ?><br />
+		<strong><?php echo _('Attach Files')._(':'); ?> </strong> <?php echo('('._('max upload size: '.human_readable_bytes(util_get_maxuploadfilesize())).')') ?><br />
 		<input type="file" name="input_file0" size="30" /><br />
 		<input type="file" name="input_file1" size="30" /><br />
 		<input type="file" name="input_file2" size="30" /><br />
diff --git a/src/common/tracker/views/form-addextrafield.php b/src/common/tracker/views/form-addextrafield.php
index 53a5920..25cfa10 100644
--- a/src/common/tracker/views/form-addextrafield.php
+++ b/src/common/tracker/views/form-addextrafield.php
@@ -110,16 +110,16 @@ $ath->adminHeader(array('title'=>$title));
 		<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&atid='.$ath->getID(); ?>" method="post">
 		<p>
 		<input type="hidden" name="add_extrafield" value="y" />
-		<strong><?php echo _('Custom Field Name') ?>:</strong><br />
+		<strong><?php echo _('Custom Field Name')._(':'); ?></strong><br />
 		<input type="text" name="name" value="" size="15" maxlength="30" />
 		</p>
 		<p>
-		<strong><?php echo _('Field alias') ?>:</strong><br />
+		<strong><?php echo _('Field alias')._(':'); ?></strong><br />
 		<input type="text" name="alias" value="" size="15" maxlength="30" />
 		</p>
 
 		<p>
-		<strong><?php  echo _('Type of custom field') ?>:</strong><br />
+		<strong><?php  echo _('Type of custom field')._(':'); ?></strong><br />
 		<input type="radio" name="field_type" value="1" /> <?php echo _('Select Box'); ?><br />
 		<input type="radio" name="field_type" value="2" /> <?php echo _('Check Box'); ?><br />
 		<input type="radio" name="field_type" value="3" /> <?php echo _('Radio Buttons'); ?><br />
diff --git a/src/common/widget/Widget_ProjectMembers.class.php b/src/common/widget/Widget_ProjectMembers.class.php
index c080389..ba55ac7 100644
--- a/src/common/widget/Widget_ProjectMembers.class.php
+++ b/src/common/widget/Widget_ProjectMembers.class.php
@@ -74,7 +74,7 @@ class Widget_ProjectMembers extends Widget {
 					continue ;
 				}
 				if (!$seen_member) {
-					echo '<span class="develtitle">'. _('Members').':</span><br />';
+					echo '<span class="develtitle">'. _('Members')._(':').'</span><br />';
 					$seen_member = true ;
 				}
 				echo '<div rel="doap:developer">'."\n";
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 46018bf..9bfbceb 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -239,7 +239,7 @@ class SVNPlugin extends SCMPlugin {
 				$i++;
 			}
 			$b .= '<tr '. $HTML->boxGetAltRowStyle($i) .'>';
-			$b .= '<td width="50%"><strong>'._('Total').':</strong></td>'.
+			$b .= '<td width="50%"><strong>'._('Total')._(':').'</strong></td>'.
 				'<td width="25%" align="right"><strong>'.$total['adds']. '</strong></td>'.
 				'<td width="25%" align="right"><strong>'.$total['commits'].'</strong></td>';
 			$b .= '</tr>';
diff --git a/src/www/admin/database.php b/src/www/admin/database.php
index 20c7bde..27cf1ac 100644
--- a/src/www/admin/database.php
+++ b/src/www/admin/database.php
@@ -157,7 +157,7 @@ if ($displaydb) {
 </tr>
 
 <tr>
-<td>Database Name:<?php echo utils_requiredField(); ?></td>
+<td><?php echo _('Database Name')._(': '); ?><?php echo utils_requiredField(); ?></td>
 <td><input type="text" required="required" name="dbname" /></td>
 </tr>
 
diff --git a/src/www/frs/admin/index.php b/src/www/frs/admin/index.php
index 5029ab6..682157d 100644
--- a/src/www/frs/admin/index.php
+++ b/src/www/frs/admin/index.php
@@ -203,9 +203,9 @@ if (!$res || $rows < 1) {
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
 <input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
 <input type="hidden" name="func" value="add_package" />
-<p><strong><?php echo _('New Package Name') ?>:</strong>
+<p><strong><?php echo _('New Package Name')._(':'); ?></strong>
 <input type="text" name="package_name" value="" size="20" maxlength="30" /></p>
-<p><strong><?php echo _('Publicly Viewable'); ?>:</strong>
+<p><strong><?php echo _('Publicly Viewable')._(':'); ?></strong>
 <input type="radio" name="is_public" value="1" checked="checked" /> <?php echo _('Public'); ?>
 <input type="radio" name="is_public" value="0" /> <?php echo _('Private'); ?></p>
 <p><input type="submit" name="submit" value="<?php echo _('Create This Package') ?>" /></p>
diff --git a/src/www/project/admin/database.php b/src/www/project/admin/database.php
index 33d68bd..0351980 100644
--- a/src/www/project/admin/database.php
+++ b/src/www/project/admin/database.php
@@ -165,7 +165,7 @@ if (db_numrows($res_db) > 0) {
 		<p><strong><span style="text-decoration:underline">'._('Add New Database').'</span></strong></p>
 		<p><em>'._('Clicking on “create” will schedule the creation of the database, and email the details to the project administrators').'</em></p>
 
-		<p><strong>'._('Database Type').':</strong></p>
+		<p><strong>'._('Database Type')._(':').'</strong></p>
 		<p><form action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="createdb" value="1" />
 		<input type="hidden" name="group_id" value="'.$group_id.'" />
diff --git a/src/www/project/admin/index.php b/src/www/project/admin/index.php
index 49adce7..4544c8f 100644
--- a/src/www/project/admin/index.php
+++ b/src/www/project/admin/index.php
@@ -258,7 +258,7 @@ if(forge_get_config('use_docman')) {
 <input type="hidden" name="use_docman" value="<?php echo ($group->usesDocman() ? '1' : '0'); ?>" />
 <p>
 <?php echo _('If you wish, you can provide default email addresses to which new submissions will be sent') ?>.<br />
-<strong><?php echo _('New Document Submissions') ?>:</strong><br />
+<strong><?php echo _('New Document Submissions')._(':'); ?></strong><br />
 <input type="text" name="new_doc_address" value="<?php echo $group->getDocEmailAddress(); ?>" size="40" maxlength="250" />
 <?php echo _('(send on all updates)') ?>
 <input type="checkbox" name="send_all_docs" value="1" <?php echo c($group->docEmailAll()); ?> />

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

Summary of changes:
 src/common/tracker/actions/admin-ind.php           |   12 ++++++------
 src/common/tracker/actions/mod-limited.php         |   20 ++++++++++----------
 src/common/tracker/actions/query.php               |    6 +++---
 src/common/tracker/include/ArtifactHtml.class.php  |    2 +-
 .../tracker/include/ArtifactTypeHtml.class.php     |    2 +-
 .../tracker/include/build_submission_form.php      |    6 +++---
 src/common/tracker/views/form-addextrafield.php    |    6 +++---
 src/common/widget/Widget_ProjectMembers.class.php  |    2 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php      |    2 +-
 src/www/admin/database.php                         |    2 +-
 src/www/frs/admin/index.php                        |    4 ++--
 src/www/project/admin/database.php                 |    2 +-
 src/www/project/admin/index.php                    |    2 +-
 13 files changed, 34 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list