[Fusionforge-commits] FusionForge branch master updated. 683291c9c2e39bde393ba00c0edaedd68965780e

Alain Peyrat aljeux at fusionforge.org
Fri Sep 13 17:06:35 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  683291c9c2e39bde393ba00c0edaedd68965780e (commit)
       via  d45949d8c2fad1c8b35964b47dcd2779f1e805be (commit)
      from  356ce18d32fecdf0f2253ecf0f4a50470a13b05c (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 683291c9c2e39bde393ba00c0edaedd68965780e
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri Sep 13 17:06:03 2013 +0200

    Minor: translation, ident, phpdoc

diff --git a/src/www/developer/monitor.php b/src/www/developer/monitor.php
index 045f3a7..4a9cb9b 100644
--- a/src/www/developer/monitor.php
+++ b/src/www/developer/monitor.php
@@ -79,7 +79,7 @@ if (!session_loggedin()) {
 		}
 		$HTML->footer (array());
 	} else {
-		$HTML->header(array('title'=>_('Error - Choose a User To Monitor First')));
+		$HTML->header(array('title'=>_('Error: Choose a User To Monitor First')));
 		$HTML->footer(array());
 	}
 
diff --git a/src/www/include/vote_function.php b/src/www/include/vote_function.php
index f60942b..3d3eeb8 100644
--- a/src/www/include/vote_function.php
+++ b/src/www/include/vote_function.php
@@ -26,6 +26,7 @@
  * vote_number_to_stars() - Turns vote results into *'s
  *
  * @param		int		Raw value
+ * @return string
  */
 function vote_number_to_stars($raw) {
 	$raw=intval($raw*2);
@@ -35,6 +36,7 @@ function vote_number_to_stars($raw) {
 	} else {
 		$show_half=1;
 	}
+	$return ='';
 	$count=intval($raw/2);
 	for ($i=0; $i<$count; $i++) {
 		$return .= html_image("ic/check.png","15","16");
@@ -402,7 +404,7 @@ function vote_show_user_rate_box ($user_id, $by_id=0) {
 		}
 	}
 
-	global $USER_RATING_VALUES,$USER_RATING_QUESTIONS,$USER_RATING_POPUP1,$USER_RATING_POPUP2,$USER_RATING_POPUP3,$USER_RATING_POPUP4,$USER_RATING_POPUP5;
+	global $USER_RATING_VALUES,$USER_RATING_QUESTIONS;
 	echo '
 	<table>
 		<form action="/developer/rate.php" method="post">
diff --git a/src/www/mail/admin/deletelist.php b/src/www/mail/admin/deletelist.php
index 3e7f037..b844c03 100644
--- a/src/www/mail/admin/deletelist.php
+++ b/src/www/mail/admin/deletelist.php
@@ -66,7 +66,7 @@ mail_header(array('title' => _('Permanently Delete Mailing List ') . $ml->getNam
 <fieldset>
 <legend><?php echo _('Confirm Delete'); ?></legend>
 <form method="post" action="<?php echo getStringFromServer('PHP_SELF'); ?>?group_id=<?php echo $group_id; ?>&group_list_id=<?php echo $ml->getID(); ?>">
-<p>Do you really want to delete mailing list <?php echo $ml->getName(); ?>?</p>
+<p><?php printf(_("Do you really want to delete mailing list %s?"), $ml->getName()); ?></p>
 <p>
 <input type="checkbox" name="sure" value="1" /><?php echo _('Confirm Delete'); ?><br />
 </p>

commit d45949d8c2fad1c8b35964b47dcd2779f1e805be
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Fri Sep 13 17:05:34 2013 +0200

    Mailman cron is running every hours, adapt message

diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 3d542c6..f45ccad 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -140,7 +140,7 @@ if ($group_id) {
 		print '</p>';
 
 		print '<p>';
-		print _('It will take <span class="important">6-24 Hours</span> for your list to be created.');
+		print _('It will take one hour for your list to be created.');
 		print '</p>';
 
 		$mlFactory = new MailingListFactory($group);
@@ -242,7 +242,7 @@ if ($group_id) {
 		}
 
 		mail_header(array(
-			'title' => _('Mailing List Administration'))
+			'title' => _('Mailing Lists Administration'))
 		);
 
 		$mlArray = $mlFactory->getMailingLists();
@@ -283,7 +283,7 @@ if ($group_id) {
 						echo '<a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&group_list_id='.$currentList->getID().'&change_status=1">'._('Update').'</a>';
 					}
 					echo '</td>';
-					echo '<td style="text-align:center">';
+					echo '<td class="align-center">';
 					if($currentList->getStatus() == MAIL__MAILING_LIST_IS_REQUESTED) {
 						echo _('Not activated yet');
 					} else {

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

Summary of changes:
 src/www/developer/monitor.php     |    2 +-
 src/www/include/vote_function.php |    4 +++-
 src/www/mail/admin/deletelist.php |    2 +-
 src/www/mail/admin/index.php      |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list