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 488e058505fd325b889a55d4a319b6357e10536f (commit)
from a92dce506563dfc6996c43333ed9e42dcf6599a3 (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=488e058505fd325b889a55d4a319b6357e10536f
commit 488e058505fd325b889a55d4a319b6357e10536f
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Mar 4 18:24:36 2016 +0100
Same messages, less strings to translate
diff --git a/src/common/frs/FRSFile.class.php b/src/common/frs/FRSFile.class.php
index 5735b6b..1df5e4e 100644
--- a/src/common/frs/FRSFile.class.php
+++ b/src/common/frs/FRSFile.class.php
@@ -421,7 +421,7 @@ class FRSFile extends Error {
$this->getID()));
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(_('Error On Update').(': ').db_error());
+ $this->setError(_('Error On Update')._(':
').db_error());
db_rollback();
return false;
}
diff --git a/src/common/include/Error.class.php
b/src/common/include/Error.class.php
index b848c8f..a873df9 100644
--- a/src/common/include/Error.class.php
+++ b/src/common/include/Error.class.php
@@ -164,7 +164,7 @@ class Error {
*
*/
function setOnUpdateError($result=""){
- $this->setError(sprintf(_('Error On Update: %s'), $result),
ERROR__ON_UPDATE_ERROR);
+ $this->setError(_('Error On Update')._(': ').$result,
ERROR__ON_UPDATE_ERROR);
}
/**
diff --git a/src/common/mail/MailingList.class.php
b/src/common/mail/MailingList.class.php
index 99bb8d5..de1de97 100644
--- a/src/common/mail/MailingList.class.php
+++ b/src/common/mail/MailingList.class.php
@@ -270,7 +270,7 @@ Thank you for registering your project with %1$s.'),
forge_get_config ('forge_na
$this->Group->getID())) ;
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(sprintf(_('Error On Update: %s'),
db_error()));
+ $this->setError(_('Error On Update')._(':
').db_error());
return false;
}
diff --git a/src/common/pm/ProjectGroup.class.php
b/src/common/pm/ProjectGroup.class.php
index 2bbec25..43864f0 100644
--- a/src/common/pm/ProjectGroup.class.php
+++ b/src/common/pm/ProjectGroup.class.php
@@ -366,7 +366,7 @@ class ProjectGroup extends Error {
$this->getID()));
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(sprintf(_('Error On Update: %s'),
db_error()));
+ $this->setError(_('Error On Update')._(':
').db_error());
return false;
}
return true;
diff --git a/src/www/admin/pending-news.php b/src/www/admin/pending-news.php
index 8f31efb..db8317e 100644
--- a/src/www/admin/pending-news.php
+++ b/src/www/admin/pending-news.php
@@ -75,7 +75,7 @@ if ($post_changes) {
$details,
$id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Error On Update: %s'),
db_error());
+ $error_msg .= _('Error On Update')._(':
').db_error();
} else {
$feedback .= _('Newsbyte Updated.');
}
@@ -85,7 +85,7 @@ if ($post_changes) {
*/
$result=db_query_params("UPDATE news_bytes SET
is_approved='2' WHERE id=$1", array($id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Error On Update: %s'),
db_error());
+ $error_msg .= _('Error On Update')._(':
').db_error();
} else {
$feedback .= _('Newsbyte Deleted.');
}
@@ -105,7 +105,7 @@ if ($post_changes) {
SET is_approved='2'
WHERE id = ANY($1)",array(db_int_array_to_any_clause($news_id)));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Error On Update: %s'),
db_error());
+ $error_msg .= _('Error On Update')._(': ').db_error();
} else {
$feedback .= _('Newsbytes Rejected.');
}
diff --git a/src/www/news/admin/index.php b/src/www/news/admin/index.php
index 8c3546d..ba81a26 100644
--- a/src/www/news/admin/index.php
+++ b/src/www/news/admin/index.php
@@ -91,7 +91,7 @@ if ($group_id && $group_id != forge_get_config('news_group'))
{
array($status,
htmlspecialchars($summary), $details, $id, $group_id));
if (!$result || db_affected_rows($result) < 1) {
- $error_msg .= sprintf(_('Error On Update: %s'),
db_error());
+ $error_msg .= _('Error On Update')._(':
').db_error();
} else {
$feedback .= _('Newsbyte Updated.');
}
diff --git a/tools/create_class.php b/tools/create_class.php
index d912214..faa07e7 100755
--- a/tools/create_class.php
+++ b/tools/create_class.php
@@ -423,12 +423,12 @@ function
generateClassUpdate($tableName,$className,$fields) {
$output .= "\t\t\$res=db_query(\$sql);\n".
"\t\tif (!\$res || db_affected_rows(\$res) < 1) {\n".
- "\t\t\t\$this->setError('Error On Update: '.db_error());\n".
+ "\t\t\t\$this->setError(_('Error On Update')._(':
').db_error());\n".
"\t\t\tdb_rollback();\n".
"\t\t\treturn false;\n".
"\t\t} else {\n".
"\t\t\tif (!$this->fetchData(\$this->getID())) {\n".
- "\t\t\t\t\$this->setError('Error On Update:
'.db_error());\n".
+ "\t\t\t\t\$this->setError(_('Error On Update')._(':
').db_error());\n".
"\t\t\t\tdb_rollback();\n".
"\t\t\t\treturn false;\n".
"\t\t\t} else {\n".
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/FRSFile.class.php | 2 +-
src/common/include/Error.class.php | 2 +-
src/common/mail/MailingList.class.php | 2 +-
src/common/pm/ProjectGroup.class.php | 2 +-
src/www/admin/pending-news.php | 6 +++---
src/www/news/admin/index.php | 2 +-
tools/create_class.php | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
