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 cb8165397c84f3241a51416416aa5bdf3f7232d4 (commit)
from 94176a1117b3f128cfce6fe4ea0fc4a9a12bcfe2 (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=cb8165397c84f3241a51416416aa5bdf3f7232d4
commit cb8165397c84f3241a51416416aa5bdf3f7232d4
Author: Franck Villaume <[email protected]>
Date: Fri Mar 30 19:14:26 2018 +0200
Fix strings, typo
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index b1d3464..28f8e3b 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -118,7 +118,7 @@ if ($g->usesPlugin('projects-hierarchy')) {
echo html_e('p', array(), html_e('input',
$attrsInputIncludeSubprojects)._('Include child projects'));
}
}
-$attrsInputLimitByStartDate = array('type' => 'checkbox', 'id' =>
'limitByStartDate', 'name' => 'limitByStartDate', 'value' => 1, 'title' =>
_('Set created start date limitation for this search. If not enable, not
limitation.'));
+$attrsInputLimitByStartDate = array('type' => 'checkbox', 'id' =>
'limitByStartDate', 'name' => 'limitByStartDate', 'value' => 1, 'title' =>
_('Set created start date limitation for this search. If not enable, no
limitation.'));
$attrsDatePickerLimitByStartDate = array('id' => 'datepicker_start', 'name' =>
'start_date', 'size' => 10, 'maxlength' => 10, 'disabled' => 'disabled');
if ($limitByStartDate) {
$attrsInputLimitByStartDate['checked'] = 'checked';
@@ -128,7 +128,7 @@ if ($limitByStartDate) {
$attrsDatePickerLimitByStartDate['value'] =
util_html_encode($received_begin);
}
}
-$attrsInputLimitByEndDate = array('type' => 'checkbox', 'id' =>
'limitByEndDate', 'name' => 'limitByEndDate', 'value' => 1, 'title' => _('Set
created end date limitation for this search. If not enable, not limitation.'));
+$attrsInputLimitByEndDate = array('type' => 'checkbox', 'id' =>
'limitByEndDate', 'name' => 'limitByEndDate', 'value' => 1, 'title' => _('Set
created end date limitation for this search. If not enable, no limitation.'));
$attrsDatePickerLimitByEndDate = array('id' => 'datepicker_end', 'name' =>
'end_date', 'size' => 10, 'maxlength' => 10, 'disabled' => 'disabled');
if ($limitByEndDate) {
$attrsInputLimitByEndDate['checked'] = 'checked';
diff --git a/src/common/forum/AttachManager.class.php
b/src/common/forum/AttachManager.class.php
index f62fa19..363a1b5 100644
--- a/src/common/forum/AttachManager.class.php
+++ b/src/common/forum/AttachManager.class.php
@@ -263,7 +263,7 @@ class AttachManager extends FFError {
}
if (!is_uploaded_file($attachment) || !($filestuff =
@file_get_contents($attachment)) ) {
- $this->messages[] = _('Error, problem with the
attachment file uploaded into the server');
+ $this->messages[] = _('Error')._(': ')._('problem with
the attachment file uploaded into the server');
return false;
}
diff --git a/src/common/forum/ForumAdmin.class.php
b/src/common/forum/ForumAdmin.class.php
index 32913ee..12d62f7 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -461,7 +461,7 @@ class ForumAdmin extends FFError {
db_begin();
if
(!db_query_params ('DELETE FROM forum WHERE msg_id=$1',
array ($fm->getID()))) {
-
$error_msg .= "DB Error ". db_error();
+
$error_msg .= "DB Error: ". db_error();
db_rollback();
break;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/search.php | 4 ++--
src/common/forum/AttachManager.class.php | 2 +-
src/common/forum/ForumAdmin.class.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
