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, 6.1 has been updated
via ffc656501593d885804ffcdd1cc7590e32842531 (commit)
via b201df577f084674e079c21562367333104fbe1b (commit)
from ecf04df97293eaa44e78537932cd75da208a9cbd (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=ffc656501593d885804ffcdd1cc7590e32842531
commit ffc656501593d885804ffcdd1cc7590e32842531
Author: Franck Villaume <[email protected]>
Date: Sun Oct 8 19:53:45 2017 +0200
space, add missing translations
diff --git a/src/bin/populate_template_project.php
b/src/bin/populate_template_project.php
index f6f7760..07ecfdb 100755
--- a/src/bin/populate_template_project.php
+++ b/src/bin/populate_template_project.php
@@ -1,9 +1,9 @@
#! /usr/bin/php
<?php
/**
- * Copyright 2010 Roland Mas
- * Copyright © 2012
- * Thorsten Glaser <[email protected]>
+ * Copyright 2010, Roland Mas
+ * Copyright 2012, Thorsten Glaser [email protected]
+ * Copyright 2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -24,7 +24,7 @@
require (dirname(__FILE__).'/../www/env.inc.php');
require_once $gfcommon.'include/pre.php';
-$err='';
+$err = '';
// Plugins subsystem
require_once 'common/include/Plugin.class.php';
@@ -33,7 +33,7 @@ require_once 'common/include/PluginManager.class.php';
setup_plugin_manager ();
session_set_admin ();
-function usage($rc=1) {
+function usage($rc = 1) {
echo "Usage:\n";
echo "\t.../populate_template_project.php 5\n";
echo "\t.../populate_template_project.php new unixname groupname\n";
@@ -66,18 +66,18 @@ function populateProject($project) {
$todo = array_keys($role->defaults);
for ($c=0; $c<count($todo); $c++) {
if (! ($role_id = $role->createDefault($todo[$c]))) {
- $project->setError(sprintf(_('R%d:
%s'),$c,$role->getErrorMessage()));
+ $project->setError(sprintf(_('R%d: %s'), $c,
$role->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
}
$role = new Role($project, $role_id);
- if ($role->getVal('projectadmin',0)=='A') {
+ if ($role->getVal('projectadmin', 0) == 'A') {
$role->setUser(session_get_user()->getID());
}
}
- if (forge_get_config ('use_tracker')) {
+ if (forge_get_config('use_tracker')) {
$ats = new ArtifactTypes($project);
if (!$ats || !is_object($ats)) {
$project->setError(_('Error creating ArtifactTypes
object'));
@@ -98,7 +98,7 @@ function populateProject($project) {
}
}
- if (forge_get_config ('use_forum')) {
+ if (forge_get_config('use_forum')) {
$f1 = new Forum($project);
if (!$f1->create(_('Open-Discussion'),_('General
Discussion'),1,'',1,0)) {
$project->setError(sprintf (_('F%d: %s'), 1,
$f1->getErrorMessage()));
@@ -125,34 +125,34 @@ function populateProject($project) {
if (forge_get_config('use_docman')) {
$dg = new DocumentGroup($project);
if (!$dg->create(_('Uncategorized Submissions'))) {
- $project->setError(sprintf(_('DG:
%s'),$dg->getErrorMessage()));
+ $project->setError(sprintf(_('DG: %s'),
$dg->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
}
}
- if (forge_get_config ('use_frs')) {
+ if (forge_get_config('use_frs')) {
$frs = new FRSPackage($project);
if (!$frs->create("UNIXNAME")) {
- $project->setError(sprintf(_('FRSP:
%s'),$frs->getErrorMessage()));
+ $project->setError(sprintf(_('FRSP: %s'),
$frs->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
}
}
- if (forge_get_config ('use_pm')) {
+ if (forge_get_config('use_pm')) {
$pg = new ProjectGroup($project);
if (!$pg->create(_('To Do'),_('Things We Have To Do'),1)) {
- $project->setError(sprintf(_('PG%d:
%s'),1,$pg->getErrorMessage()));
+ $project->setError(sprintf(_('PG%d: %s'), 1,
$pg->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
}
$pg = new ProjectGroup($project);
if (!$pg->create(_('Next Release'),_('Items For Our Next
Release'),1)) {
- $project->setError(sprintf(_('PG%d:
%s'),2,$pg->getErrorMessage()));
+ $project->setError(sprintf(_('PG%d: %s'), 2,
$pg->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
@@ -164,27 +164,27 @@ function populateProject($project) {
$ra->linkProject ($project);
$rl->linkProject ($project);
- $ra->setSetting ('project_read', $project->getID(), 1);
- $rl->setSetting ('project_read', $project->getID(), 1);
+ $ra->setSetting('project_read', $project->getID(), 1);
+ $rl->setSetting('project_read', $project->getID(), 1);
- $ra->setSetting ('frs', $project->getID(), 1);
- $rl->setSetting ('frs', $project->getID(), 1);
+ $ra->setSetting('frs', $project->getID(), 1);
+ $rl->setSetting('frs', $project->getID(), 1);
- $ra->setSetting ('docman', $project->getID(), 1);
- $rl->setSetting ('docman', $project->getID(), 1);
+ $ra->setSetting('docman', $project->getID(), 1);
+ $rl->setSetting('docman', $project->getID(), 1);
- $ra->setSetting ('forum', $f1->getID(), 3);
- $rl->setSetting ('forum', $f1->getID(), 3);
+ $ra->setSetting('forum', $f1->getID(), 3);
+ $rl->setSetting('forum', $f1->getID(), 3);
- $ra->setSetting ('forum', $f2->getID(), 3);
- $rl->setSetting ('forum', $f2->getID(), 3);
+ $ra->setSetting('forum', $f2->getID(), 3);
+ $rl->setSetting('forum', $f2->getID(), 3);
$pgf = new ProjectGroupFactory ($project);
foreach ($pgf->getAllProjectGroupIds() as $pgid) {
$pg = projectgroup_get_object($pgid);
if ($pg->isPublic()) {
- $ra->setSetting ('pm', $pgid, 1);
- $rl->setSetting ('pm', $pgid, 1);
+ $ra->setSetting('pm', $pgid, 1);
+ $rl->setSetting('pm', $pgid, 1);
}
}
@@ -192,64 +192,58 @@ function populateProject($project) {
foreach ($atf->getAllArtifactTypeIds() as $atid) {
$at = artifactType_get_object ($atid);
if ($at->isPublic()) {
- $ra->setSetting ('tracker', $atid, 1);
- $rl->setSetting ('tracker', $atid, 1);
+ $ra->setSetting('tracker', $atid, 1);
+ $rl->setSetting('tracker', $atid, 1);
}
}
if (forge_get_config('use_mail')) {
$mlist = new MailingList($project);
if (!hasmailinglist($project, 'commits') &&
-
!$mlist->create('commits',_('Commits'),1,session_get_user()->getID())) {
+ !$mlist->create('commits',_('Commits'), 1,
session_get_user()->getID())) {
$project->setError(sprintf(_('ML:
%s'),$mlist->getErrorMessage()));
db_rollback();
setup_gettext_from_context();
return false;
}
}
- $project->normalizeAllRoles ();
+ $project->normalizeAllRoles();
db_commit();
return true;
}
-if (in_array($argv[1], array('-h', '-?', '--help'))) {
+if (isset($argv[1]) && in_array($argv[1], array('-h', '-?', '--help'))) {
usage(0);
} elseif (count($argv) == 2) {
if (!($gid = util_nat0($argv[1]))) {
usage();
}
if (!($project = group_get_object($gid))) {
- printf("Group #%d not found!\n", $gid);
+ printf(_('Group #%d not found!')."\n", $gid);
usage();
}
if (!populateProject($project)) {
- printf("Error: could not populate new group: %s\n",
- $project->getErrorMessage());
+ echo _('Error')._(': ')._('could not populate new group')._(':
').$project->getErrorMessage()."\n";
exit(1);
}
-} elseif (count($argv) == 4 && $argv[1] == "new") {
+} elseif (count($argv) == 4 && $argv[1] == 'new') {
db_begin();
$project = new Group();
- $desc = sprintf("Template project %s (%s) populated on %s",
- $argv[2], $argv[3], date("r"));
- if (!$project->create(session_get_user(), $argv[3], $argv[2],
- $desc, $desc)) {
+ $desc = sprintf(_('Template project %s (%s) populated on %s'),
$argv[2], $argv[3], date("r"));
+ if (!$project->create(session_get_user(), $argv[3], $argv[2], $desc,
$desc)) {
db_rollback();
- printf("Error: could not create group: %s\n",
- $project->getErrorMessage());
+ echo _('Error')._(': ')._('could not create group')._(':
').$project->getErrorMessage()."\n";
exit(1);
}
if (!$project->setAsTemplate(true)) {
db_rollback();
- printf("Error: could not mark group as template: %s\n",
- db_error());
+ echo _('Error')._(': ')._('could not mark group as
template')._(': ').db_error()."\n";
exit(1);
}
if (!populateProject($project)) {
- printf("Error: could not populate new group: %s\n",
- $project->getErrorMessage());
+ echo _('Error')._(': ')._('could not populate new group')._(':
').$project->getErrorMessage()."\n";
exit(1);
}
db_commit();
@@ -257,6 +251,5 @@ if (in_array($argv[1], array('-h', '-?', '--help'))) {
usage();
}
-printf("Group #%d %s (%s) populated successfully.\n", $project->getID(),
- $project->getUnixName(), $project->getPublicName());
+printf(_('Group #%d %s (%s) populated successfully.')."\n", $project->getID(),
$project->getUnixName(), $project->getPublicName());
exit(0);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b201df577f084674e079c21562367333104fbe1b
commit b201df577f084674e079c21562367333104fbe1b
Author: Franck Villaume <[email protected]>
Date: Sun Oct 8 19:53:13 2017 +0200
space
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index b11c01e..0c330ca 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -306,7 +306,7 @@ class ArtifactTypeHtml extends ArtifactType {
$efarr[$i]['show100'] = $status_show_100;
}
- $allowed=false;
+ $allowed = false;
if ($efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_SELECT ||
$efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
@@ -1487,13 +1487,13 @@ class ArtifactTypeHtml extends ArtifactType {
}
}
- function lastModifierBox($name='last_modified_by[]', $checked='xzxz',
$show_100=true, $text_100='none', $extra_id='-1', $extra_name='',
$multiple=false) {
+ function lastModifierBox($name = 'last_modified_by[]', $checked =
'xzxz', $show_100 = true, $text_100 = 'none', $extra_id = '-1', $extra_name =
'', $multiple = false) {
if ($text_100=='none'){
$text_100=_('Nobody');
}
$result = $this->getLastModifiers();
- $ids =& util_result_column_to_array($result,0);
- $names =& util_result_column_to_array($result,1);
+ $ids =& util_result_column_to_array($result, 0);
+ $names =& util_result_column_to_array($result, 1);
if ($extra_id != '-1') {
$ids[] = $extra_id;
$names[] = $extra_name;
-----------------------------------------------------------------------
Summary of changes:
src/bin/populate_template_project.php | 89 ++++++++++------------
.../tracker/include/ArtifactTypeHtml.class.php | 8 +-
2 files changed, 45 insertions(+), 52 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
