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 74c5ff2288ff58361f2ed9b7cadbc658ce7a94c1 (commit)
from 143db8854647fafd671c64597fcd38dd4daa198a (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=74c5ff2288ff58361f2ed9b7cadbc658ce7a94c1
commit 74c5ff2288ff58361f2ed9b7cadbc658ce7a94c1
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Nov 8 11:58:52 2017 +0100
Less strings
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index 1ba9b46..edc1423 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1418,7 +1418,7 @@ class FFUser extends FFError {
$this->getID()));
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(_('Error: Cannot Change User
Password:').' '.db_error());
+ $this->setError(_('Error')._(': ')._('Could not change
password')._(': ').db_error());
db_rollback();
return false;
} else {
@@ -1447,7 +1447,7 @@ class FFUser extends FFError {
* @param string $md5 The MD5-hashed password.
*/
function setMD5Passwd($md5) {
- exit(_('Error: Cannot Change User Password:').' '._('MD5
obsoleted'));
+ exit(_('Error')._(': ')._('Could not change password')._(':
')._('MD5 obsoleted'));
}
/**
@@ -1465,7 +1465,7 @@ class FFUser extends FFError {
array($unix, $this->getID()));
if (!$res || db_affected_rows($res) < 1) {
- $this->setError(_('Error: Cannot Change User
Password:').' '.db_error());
+ $this->setError(_('Error')._(': ')._('Could not
change password')._(': ').db_error());
db_rollback();
return false;
}
diff --git a/src/www/admin/passedit.php b/src/www/admin/passedit.php
index 4f6139d..1193aaf 100644
--- a/src/www/admin/passedit.php
+++ b/src/www/admin/passedit.php
@@ -70,7 +70,7 @@ if (getStringFromRequest('submit')) {
form_release_key(getStringFromRequest('form_key'));
exit_error(
_('Error'),
- _('Could not change password: ').$u->getErrorMessage()
+ _('Could not change password')._(':
').$u->getErrorMessage()
);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/User.class.php | 6 +++---
src/www/admin/passedit.php | 2 +-
2 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
