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 4540cdf20954f67f7c1a02eb48d2bde2aa6f46e9 (commit)
via e4248e18d6e73f9257523d932c150e4c0045866c (commit)
via adbe242c0978d5d44802802d600df0cf4456ba59 (commit)
via af2f3c2abf9430133288734f2c50ab61b8e4499d (commit)
from 7153e129022144f3b674426023e499767d916acb (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=4540cdf20954f67f7c1a02eb48d2bde2aa6f46e9
commit 4540cdf20954f67f7c1a02eb48d2bde2aa6f46e9
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Sep 5 14:44:32 2016 +0200
Less strings
diff --git a/src/www/people/editjob.php b/src/www/people/editjob.php
index 5b57639..a786d9d 100644
--- a/src/www/people/editjob.php
+++ b/src/www/people/editjob.php
@@ -98,7 +98,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
$feedback .= _('Job updated successfully');
}
} else {
- $error_msg .= _('Job update failed - wrong project_id');
+ $error_msg .= _('Job update failed')._(': ')._('wrong
project_id');
}
} elseif (getStringFromRequest('update_job_inventory')) {
@@ -119,7 +119,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
$feedback .= _('Job skill updated
successfully');
}
} else {
- $error_msg .= _('Job skill update failed - wrong
project_id');
+ $error_msg .= _('Job skill update failed')._(':
')._('wrong project_id');
}
} elseif (getStringFromRequest('delete_from_job_inventory')) {
@@ -139,7 +139,7 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
$feedback .= _('Job skill deleted
successfully');
}
} else {
- $error_msg .= _('Job skill delete failed - wrong
project_id');
+ $error_msg .= _('Job skill delete failed')._(':
')._('wrong project_id');
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e4248e18d6e73f9257523d932c150e4c0045866c
commit e4248e18d6e73f9257523d932c150e4c0045866c
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Sep 5 13:54:32 2016 +0200
Less strings
diff --git a/src/www/register/index.php b/src/www/register/index.php
index 1d623b3..d5968b6 100644
--- a/src/www/register/index.php
+++ b/src/www/register/index.php
@@ -149,7 +149,7 @@ if (getStringFromRequest('submit')) {
} elseif ($group->isError()) {
echo $HTML->error_msg($group->getErrorMessage());
} else {
- printf(_('Approving Project: %s'),
$group->getUnixName());
+ echo _('Approving Project')._(':
').$group->getUnixName();
echo '<br />';
if (forge_get_config('project_auto_approval')) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=adbe242c0978d5d44802802d600df0cf4456ba59
commit adbe242c0978d5d44802802d600df0cf4456ba59
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Sep 5 13:09:36 2016 +0200
Less strings
diff --git a/src/www/admin/index.php b/src/www/admin/index.php
index 6a59e76..7f8dd05 100644
--- a/src/www/admin/index.php
+++ b/src/www/admin/index.php
@@ -108,7 +108,7 @@ echo html_ac(html_ap() - 1);
AND is_template = 0',
array());
$row = db_fetch_array($res);
- printf(_('Registered projects: <strong>%d</strong>'),
$row['count']);
+ echo _('Registered projects')._(':
').'<strong>'.$row['count'].'</strong>';
?></li>
<li><?php
$res = db_query_params('SELECT count(*) AS count FROM groups
@@ -118,7 +118,7 @@ echo html_ac(html_ap() - 1);
AND is_template = 0',
array('A'));
$row = db_fetch_array($res);
- printf(_('Active projects: <strong>%d</strong>'),
$row['count']);
+ echo _('Active projects')._(':
').'<strong>'.$row['count'].'</strong>';
?></li>
<li><?php
$res = db_query_params('SELECT count(*) AS count FROM groups
@@ -128,7 +128,7 @@ echo html_ac(html_ap() - 1);
AND is_template = 0',
array('P'));
$row = db_fetch_array($res);
- printf(_('Pending projects: <strong>%d</strong>'),
$row['count']);
+ echo _('Pending projects')._(':
').'<strong>'.$row['count'].'</strong>';
?></li>
<li><?php echo util_make_link('/admin/grouplist.php', _('Display Full
Project List/Edit Projects')); ?></li>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=af2f3c2abf9430133288734f2c50ab61b8e4499d
commit af2f3c2abf9430133288734f2c50ab61b8e4499d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Sep 5 13:00:11 2016 +0200
Less strings
diff --git a/src/plugins/projectlabels/www/index.php
b/src/plugins/projectlabels/www/index.php
index 89ac2e0..0c80b52 100644
--- a/src/plugins/projectlabels/www/index.php
+++ b/src/plugins/projectlabels/www/index.php
@@ -210,7 +210,7 @@ echo _('You can create new labels with the form below.')
?></p>
<p>
<input type="hidden" name="func" value="addlabel" />
<?php echo utils_requiredField(); ?>
- <?php echo _('Name of the label')._(': ') ; ?><br/>
+ <?php echo _('Label name')._(': ') ; ?><br/>
<input type="text" required="required" size="15" maxlength="32"
name="label_name" value="<?php echo _('potm') ; ?>"/> <br/>
<?php echo _('Displayed text (or HTML) for the label')._(':
') ; ?><br/>
<textarea tabindex='1' accesskey="," name="label_text" rows='5'
-----------------------------------------------------------------------
Summary of changes:
src/plugins/projectlabels/www/index.php | 2 +-
src/www/admin/index.php | 6 +++---
src/www/people/editjob.php | 6 +++---
src/www/register/index.php | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
