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 55be377d1febe238acf0ba521cf6b67b9e7e90a1 (commit)
via af2c46ccb15becec064579d79ac9ddf12dedef87 (commit)
from 641a3cda7a68289a4acdfb67baa66ea5f356ecdd (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=55be377d1febe238acf0ba521cf6b67b9e7e90a1
commit 55be377d1febe238acf0ba521cf6b67b9e7e90a1
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Apr 28 18:20:55 2017 +0200
Shorter strings to ease translation
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index c1c397e..6dc5469 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -486,21 +486,19 @@ class FFUser extends FFError {
* @return bool success or not
*/
function sendRegistrationEmail() {
- $message = stripcslashes(sprintf(_('Thank you for registering
on the %3$s web site. You have
-account with username %1$s created for you. In order
-to complete your registration, visit the following url:
-
-<%2$s>
-
-You have 1 week to confirm your account. After this time, your account will be
deleted.
-
-(If you don\'t see any URL above, it is likely due to a bug in your mail
client.
-Use one below, but make sure it is entered as the single line.)
-
-%2$s'),
- $this->getUnixName(),
-
util_make_url('/account/verify.php?confirm_hash=_'.$this->getConfirmHash()),
- forge_get_config('forge_name')));
+ $message = sprintf(_('Thank you for registering on the %s web
site.'), forge_get_config('forge_name'));
+ $message .= "\n";
+ $message .= sprintf(_('You have account with username %s
created for you.'), $this->getUnixName());
+ $message .= "\n";
+ $message .= _('In order to complete your registration, visit
the following url:');
+ $message .= "\n\n";
+ $message .=
'<'.util_make_url('/account/verify.php?confirm_hash=_'.$this->getConfirmHash()).'>';
+ $message .= "\n\n";
+ $message .= _('You have 1 week to confirm your account. After
this time, your account will be deleted.');
+ $message .= "\n\n";
+ $message .= _("(If you don't see any URL above, it is likely
due to a bug in your mail client. Use one below, but make sure it is entered as
the single line.)");
+ $message .= "\n\n";
+ $message .=
util_make_url('/account/verify.php?confirm_hash=_'.$this->getConfirmHash());
$message .= "\n\n";
$message .= _('Enjoy the site.');
$message .= "\n\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af2c46ccb15becec064579d79ac9ddf12dedef87
commit af2c46ccb15becec064579d79ac9ddf12dedef87
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Apr 28 18:15:37 2017 +0200
Whitespace
diff --git a/src/www/project/report/index.php b/src/www/project/report/index.php
index 5528f4f..04b005d 100644
--- a/src/www/project/report/index.php
+++ b/src/www/project/report/index.php
@@ -36,31 +36,31 @@ function GetTime ($timedifference) {
$mval = ($timedifference / 2592000);
$monthval = intval($mval);
- if ($monthval > 1 ) {
+ if ($monthval > 1) {
return "$monthval Months Ago";
}
$wval = ($timedifference / 604800);
$weektime = intval($wval);
- if ($weektime > 1 ) {
+ if ($weektime > 1) {
return "$weektime Weeks Ago";
}
$dval = ($timedifference / 86400) ;
$daytime = intval($dval);
- if ($daytime > 1 ) {
+ if ($daytime > 1) {
return "$daytime Days Ago";
}
$hval = ($timedifference / 3600);
$hourtime = intval($hval);
- if ($hourtime > 1 ) {
+ if ($hourtime > 1) {
return "$hourtime Hours Ago";
}
$mval = ($timedifference / 60);
$minutetime = intval($mval);
- if ( $minutetime > 1 ) {
+ if ($minutetime > 1) {
return "$minutetime Minutes Ago";
}
@@ -72,38 +72,36 @@ function GetTime ($timedifference) {
$mval = ($timedifference / 2592000);
$monthval = intval($mval);
- if ($monthval > 1 ) {
+ if ($monthval > 1) {
return "Next $monthval Months";
}
$wval = ($timedifference / 604800);
$weektime = intval($wval);
- if ($weektime > 1 ) {
+ if ($weektime > 1) {
return "Next $weektime Weeks";
}
$dval = ($timedifference / 86400) ;
$daytime = intval($dval);
- if ($daytime > 1 ) {
+ if ($daytime > 1) {
return "Next $daytime Days";
}
$hval = ($timedifference / 3600);
$hourtime = intval($hval);
- if ($hourtime > 1 ) {
+ if ($hourtime > 1) {
return "Next $hourtime Hours";
}
$mval = ($timedifference / 60);
$minutetime = intval($mval);
- if ( $minutetime > 1 ) {
+ if ($minutetime > 1) {
return "Next $minutetime Minutes";
}
return "Next $timedifference Seconds";
-
}
-
}
//
@@ -143,7 +141,7 @@ echo $HTML->listTableTop($title_arr);
foreach ($group->getUsers() as $member) {
$cells = array();
$link = util_make_link_u ($member->getUnixName(), $member->getID(),
$member->getRealName()) ;
- if (
RBACEngine::getInstance()->isActionAllowedForUser($member,'project_admin',$group->getID()))
{
+ if
(RBACEngine::getInstance()->isActionAllowedForUser($member,'project_admin',$group->getID()))
{
$cells[][] = html_e('strong', array(), $link);
} else {
$cells[][] = $link;
@@ -174,11 +172,11 @@ foreach ($group->getUsers() as $member) {
$cells = array();
$cells[][] =
util_make_link('/tracker/?func=detail&aid='. $artifact->getID()
.'&group_id='.$artifact->ArtifactType->Group->getID().'&atid='.$artifact->ArtifactType->getID(),
$artifact->ArtifactType->getName().' '.$artifact->getID());
$cells[][] = $artifact->getSummary();
- $cells[][] = GetTime( time() -
$artifact->getOpenDate());
+ $cells[][] = GetTime(time() - $artifact->getOpenDate());
$messages = db_query_params("select adddate FROM
artifact_message_user_vw ".
"WHERE artifact_id=$1 ".
"ORDER by adddate
DESC", array($artifact->getID()));
- if ( db_numrows($messages)) {
+ if (db_numrows($messages)) {
$cells[][] = GetTime(time() -
db_result($messages, 0, 'adddate'));
} else {
$cells[][] = GetTime(time() -
$artifact->getOpenDate());;
-----------------------------------------------------------------------
Summary of changes:
src/common/include/User.class.php | 28 +++++++++++++---------------
src/www/project/report/index.php | 28 +++++++++++++---------------
2 files changed, 26 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
