[Fusionforge-commits] FusionForge branch master updated. 6.0.4-585-g546e1d4

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Wed Jun 22 11:37:50 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  546e1d4d4f94c72601423df0259cdc52f9a95d03 (commit)
      from  e4903874973cf38aeee526bc329b0185094caeb7 (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=546e1d4d4f94c72601423df0259cdc52f9a95d03

commit 546e1d4d4f94c72601423df0259cdc52f9a95d03
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Wed Jun 22 11:37:45 2016 +0200

    Less strings

diff --git a/src/common/docman/actions/deleteversion.php b/src/common/docman/actions/deleteversion.php
index 23a2470..12410c7 100644
--- a/src/common/docman/actions/deleteversion.php
+++ b/src/common/docman/actions/deleteversion.php
@@ -46,7 +46,7 @@ if ($docid && $version) {
 		$dv = new DocumentVersion($documentObject);
 		if ($dv && !$dv->isError()) {
 			if ($dv->delete($version)) {
-				$result['html'] = $HTML->feedback(_('Version deleted successfully'));
+				$result['html'] = $HTML->feedback(_('Version deleted successfully.'));
 				$result['status'] = 1;
 			} else {
 				$result['html'] = $HTML->error_msg(_('Cannot delete version')._(': ').$version.' '.$dv->getErrorMessage());
diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index 7d93fc5..f21b830 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -129,7 +129,7 @@ if ($dgf->getNested($stateidArr) == NULL) {
 	$cells = array();
 	$cells[][] = _('Upload File').utils_requiredField();
 	$cells[][] = html_e('input', array('type' => 'file', 'required' => 'required', 'name' => 'uploaded_data')).
-			html_e('span', array(), sprintf(_('(max upload size: %s)'), human_readable_bytes(util_get_maxuploadfilesize())), false);
+			html_e('span', array(), '('._('max upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')', false);
 	echo $HTML->multiTableRow(array('id' => 'filerow'), $cells);
 	$cells = array();
 	$cells[][] = _('URL').utils_requiredField();
diff --git a/src/common/docman/views/additem.php b/src/common/docman/views/additem.php
index eace0a4..f21e715 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -85,7 +85,7 @@ if (forge_check_perm('docman', $group_id, 'approve')) {
 		echo html_ao('p');
 		echo html_e('label', array(), _('Upload archive:'), false);
 		echo html_e('input', array('type' => 'file', 'name' => 'uploaded_zip', 'required' => 'required'));
-		echo html_e('span', array(), sprintf(_('(max upload size: %s)'),human_readable_bytes(util_get_maxuploadfilesize())), false);
+		echo html_e('span', array(), '('._('max upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')', false);
 		echo html_e('input', array('id' => 'submitinjectzip', 'type' => 'button', 'value' => _('Inject Tree')));
 		echo html_ac(html_ap() -1);
 		echo $HTML->closeForm();
diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index 52510c0..f6910f5 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -132,7 +132,7 @@ $cells[][] = html_e('input', array('id' => 'editFileurl', 'type' => 'url', 'name
 echo $HTML->multiTableRow(array('id' => 'fileurlroweditfile', 'class' => 'hide'), $cells);
 $cells = array();
 $cells[] = array(_('File')._(':'), 'class' => 'docman_editfile_file');
-$cells[][] = html_e('input', array('type' => 'file', 'name' => 'uploaded_data')).html_e('br').sprintf(_('(max upload size: %s)'),human_readable_bytes(util_get_maxuploadfilesize()));
+$cells[][] = html_e('input', array('type' => 'file', 'name' => 'uploaded_data')).html_e('br').'('._('max upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')';
 echo $HTML->multiTableRow(array('id' => 'uploadnewroweditfile', 'class' => 'hide'), $cells);
 echo $HTML->listTableBottom();
 echo html_e('input', array('type' => 'hidden', 'id' => 'docid', 'name' => 'docid'));
diff --git a/src/common/forum/ForumHTML.class.php b/src/common/forum/ForumHTML.class.php
index d0a2017..194229e 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -136,7 +136,7 @@ function forum_header($params) {
 		if ($f) {
 			if ($f->isMonitoring()) {
 				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
-								 html_image('ic/xmail16w.png').' '._('Stop Monitoring')).' | ';
+								 html_image('ic/xmail16w.png').' '._('Stop monitoring')).' | ';
 			} else {
 				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
 							 html_image('ic/mail16w.png').' '._('Monitor Forum')).' | ';
diff --git a/src/common/include/Navigation.class.php b/src/common/include/Navigation.class.php
index 9fc360a..79b7d58 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -469,7 +469,7 @@ class Navigation extends FFError {
 			// Project/Task Manager
 			if ($group->usesPM()) {
 				$menu['titles'][] = _('Tasks');
-				$menu['tooltips'][] = _('Project Management.');
+				$menu['tooltips'][] = _('Project Management');
 				$menu['urls'][] = util_make_uri('/pm/?group_id=' . $group_id);
 				if (forge_check_perm ('pm_admin', $group_id)) {
 					$menu['adminurls'][] = util_make_uri('/pm/admin/?group_id='.$group_id);
diff --git a/src/common/include/rbac_texts.php b/src/common/include/rbac_texts.php
index 5077317..0ff80ea 100644
--- a/src/common/include/rbac_texts.php
+++ b/src/common/include/rbac_texts.php
@@ -65,7 +65,7 @@ function setup_rbac_strings () {
 								  'pm_admin1' => _('Task managers administration'),
 								  'forum_admin0' => _('No administrative access'),
 								  'forum_admin1' => _('Forums Administration'),
-								  'frs_admin0' => _('No access'),
+								  'frs_admin0' => _('No Access'),
 								  'frs_admin1' => _('FRS access'),
 								  'frs_admin2' => _('FRS administrator'),
 
@@ -85,7 +85,7 @@ function setup_rbac_strings () {
 								  'tracker13' => _('Manager'),
 								  'tracker14' => _('Tech & manager (no read access)'),
 								  'tracker15' => _('Tech & manager'),
-								  'tracker16' => _('No access + Vote'),
+								  'tracker16' => _('No Access + Vote'),
 								  'tracker17' => _('Read only + Vote'),
 								  'tracker18' => _('Technician (no read access, no submitting) + Vote'),
 								  'tracker19' => _('Technician (no submitting) + Vote'),
@@ -131,7 +131,7 @@ function setup_rbac_strings () {
 								  'new_tracker13' => _('Manager'),
 								  'new_tracker14' => _('Tech & manager (no read access)'),
 								  'new_tracker15' => _('Tech & manager'),
-								  'new_tracker16' => _('No access + Vote'),
+								  'new_tracker16' => _('No Access + Vote'),
 								  'new_tracker17' => _('Read only + Vote'),
 								  'new_tracker18' => _('Technician (no read access, no submitting) + Vote'),
 								  'new_tracker19' => _('Technician (no submitting) + Vote'),
@@ -170,12 +170,12 @@ function setup_rbac_strings () {
 								  'docman3' => _('Approve documents'),
 								  'docman4' => _('Doc manager administration'),
 
-								  'frs0' => _('No access'),
+								  'frs0' => _('No Access'),
 								  'frs1' => _('Read only'),
 								  'frs2' => _('Files management'),
 								  'frs3' => _('Files & releases management'),
 								  'frs4' => _('Package admin'),
-								  'new_frs0' => _('No access'),
+								  'new_frs0' => _('No Access'),
 								  'new_frs1' => _('Read only'),
 								  'new_frs2' => _('Files management'),
 								  'new_frs3' => _('Files & releases management'),
diff --git a/src/common/tracker/actions/detail.php b/src/common/tracker/actions/detail.php
index a80c9c0..51fffa1 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -54,7 +54,7 @@ if (session_loggedin()) { ?>
 				<?php
 					if ($ah->isMonitoring()) {
 						$img="xmail16w.png";
-						$text=_('Stop Monitoring');
+						$text=_('Stop monitoring');
 					} else {
 						$img="mail16w.png";
 						$text=_('Monitor');
@@ -191,7 +191,7 @@ $nb = $count? ' ('.$count.')' : '';
 	<table width="80%">
 		<tr><td colspan="2">
 		<?php if (session_loggedin() && ($ah->getSubmittedBy() == user_getid())) { ?>
-			<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" /><br />
 			<input type="file" name="input_file1" /><br />
 			<input type="file" name="input_file2" /><br />
diff --git a/src/common/tracker/actions/mod-limited.php b/src/common/tracker/actions/mod-limited.php
index c61d736..53a9404 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -64,7 +64,7 @@ if (session_loggedin()) {
 			<td><?php
 				if ($ah->isMonitoring()) {
 					$img="xmail16w.png";
-					$text=_('Stop Monitoring');
+					$text=_('Stop monitoring');
 				} else {
 					$img="mail16w.png";
 					$text=_('Monitor');
@@ -216,7 +216,7 @@ $nb = $count? ' ('.$count.')' : '';
 <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 />
diff --git a/src/common/tracker/actions/mod.php b/src/common/tracker/actions/mod.php
index 0f67c7a..ac2be76 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -67,7 +67,7 @@ if (session_loggedin()) {
 			<td><?php
 				if ($ah->isMonitoring()) {
 					$img="xmail16w.png";
-					$text=_('Stop Monitoring');
+					$text=_('Stop monitoring');
 				} else {
 					$img="mail16w.png";
 					$text=_('Monitor');
@@ -286,7 +286,7 @@ $nb = $count? ' ('.$count.')' : '';
 <h2><?php echo _('Existing Files')._(':'); ?></h2>
 <table width="80%">
 	<tr><td colspan="2">
-        <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/include/build_submission_form.php b/src/common/tracker/include/build_submission_form.php
index 3604d99..6c3abbf 100644
--- a/src/common/tracker/include/build_submission_form.php
+++ b/src/common/tracker/include/build_submission_form.php
@@ -99,7 +99,7 @@ function artifact_submission_form($ath, $group, $summary='', $details='', $assig
 	$content = html_ao('div', array('class'=>'file_attachments'));
 	$content .= html_ao('p');
 	$content .= html_e('strong', array(), _('Attach Files')._(':'));
-	$content .= '('._('max upload size: '.human_readable_bytes(util_get_maxuploadfilesize())).')'.html_e('br');
+	$content .= '('._('max upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')'.html_e('br');
 	$content .= html_e('input', array('type'=>'file', 'name'=>'input_file0')).html_e('br');
 	$content .= html_e('input', array('type'=>'file', 'name'=>'input_file1')).html_e('br');
 	$content .= html_e('input', array('type'=>'file', 'name'=>'input_file2')).html_e('br');
diff --git a/src/common/widget/Widget_MyMonitoredDocuments.class.php b/src/common/widget/Widget_MyMonitoredDocuments.class.php
index 8363089..b18bfd3 100644
--- a/src/common/widget/Widget_MyMonitoredDocuments.class.php
+++ b/src/common/widget/Widget_MyMonitoredDocuments.class.php
@@ -91,7 +91,7 @@ class Widget_MyMonitoredDocuments extends Widget {
 							$cells = array();
 							$cells[] = array('   - '.util_make_link('/docman/?group_id='.$distinctMonitorGroupId.'&view=listfile&dirid='.$documentObject->getDocGroupID(), stripslashes($documentObject->getFileName())), 'style' => 'width:99%');
 							$cells[] = array(util_make_link('/docman/?group_id='.$distinctMonitorGroupId.'&action=monitorfile&option=stop&view=listfile&dirid='.$documentObject->getDocGroupID().'&fileid='.$documentObject->getID(),
-									$HTML->getDeletePic(_('Stop Monitoring'), _('Stop Monitoring'), array('onClick' => 'return confirm("'._('Stop monitoring this document?').'")'))),
+									$HTML->getDeletePic(_('Stop monitoring'), _('Stop monitoring'), array('onClick' => 'return confirm("'._('Stop monitoring this document?').'")'))),
 									'class' => 'align-center');
 							$html .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($key, true)), $cells);
 
diff --git a/src/common/widget/Widget_MyMonitoredForums.class.php b/src/common/widget/Widget_MyMonitoredForums.class.php
index f97ad4f..aa29fb4 100644
--- a/src/common/widget/Widget_MyMonitoredForums.class.php
+++ b/src/common/widget/Widget_MyMonitoredForums.class.php
@@ -103,7 +103,7 @@ class Widget_MyMonitoredForums extends Widget {
 								$cells = array();
 								$cells[] = array('   - '.util_make_link('/forum/forum.php?forum_id='.$validMonitoredForumId, $forumObject->getName()), 'style' => 'width:99%');
 								$cells[] = array(util_make_link('/forum/monitor.php?forum_id='.$validMonitoredForumId.'&group_id='.$groupObject->getID().'&stop=1',
-										$HTML->getDeletePic(_('Stop Monitoring'), _('Stop Monitoring'), array('onClick' => 'return confirm("'._('Stop monitoring this forum?').'")'))),
+										$HTML->getDeletePic(_('Stop monitoring'), _('Stop monitoring'), array('onClick' => 'return confirm("'._('Stop monitoring this forum?').'")'))),
 										'class' => 'align-center');
 								$html .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($key, true)), $cells);
 							}
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php b/src/plugins/hudson/include/hudsonPlugin.class.php
index 414689e..e4ccbe7 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -303,7 +303,7 @@ control over it to the project administrator.");
 						$html .= '   </ul>';
 						$html .= '  </td>';
 						$html .= '  <td class="widget_lastbuilds_weather">';
-						$html .= _("Weather Report:").'<img src="'.$job->getWeatherReportIcon().'" align="middle" />';
+						$html .= _('Weather Report')._(':').'<img src="'.$job->getWeatherReportIcon().'" align="middle" />';
 						$html .= '  </td>';
 						$html .= ' </tr>';
 						$html .= '</table>';

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

Summary of changes:
 src/common/docman/actions/deleteversion.php             |  2 +-
 src/common/docman/views/addfile.php                     |  2 +-
 src/common/docman/views/additem.php                     |  2 +-
 src/common/docman/views/editfile.php                    |  2 +-
 src/common/forum/ForumHTML.class.php                    |  2 +-
 src/common/include/Navigation.class.php                 |  2 +-
 src/common/include/rbac_texts.php                       | 10 +++++-----
 src/common/tracker/actions/detail.php                   |  4 ++--
 src/common/tracker/actions/mod-limited.php              |  4 ++--
 src/common/tracker/actions/mod.php                      |  4 ++--
 src/common/tracker/include/build_submission_form.php    |  2 +-
 src/common/widget/Widget_MyMonitoredDocuments.class.php |  2 +-
 src/common/widget/Widget_MyMonitoredForums.class.php    |  2 +-
 src/plugins/hudson/include/hudsonPlugin.class.php       |  2 +-
 14 files changed, 21 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list