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 acef605ba34264f3f391ddc6feb827747a9fe911 (commit)
from 830c368b120dc20f0141b64faa0b4d1ccf3fee20 (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=acef605ba34264f3f391ddc6feb827747a9fe911
commit acef605ba34264f3f391ddc6feb827747a9fe911
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Oct 6 16:18:37 2016 +0200
Block password reset for suspended/deleted users: fix translation syntax
diff --git a/src/www/account/change_email-complete.php
b/src/www/account/change_email-complete.php
index cf8e957..6735343 100644
--- a/src/www/account/change_email-complete.php
+++ b/src/www/account/change_email-complete.php
@@ -53,7 +53,7 @@ if (!$u || !is_object($u)) {
} elseif ($u->isError()) {
exit_error($u->getErrorMessage(),'my');
} elseif (($u->getStatus() == 'S') || ($u->getStatus() == 'D')) {
- exit_error(_('Account is suspended or deleted','my'));
+ exit_error(_('Account is suspended or deleted'),'my');
}
if (!$u->setEmail($u->getNewEmail())) {
diff --git a/src/www/account/lostlogin.php b/src/www/account/lostlogin.php
index 4ae7d8c..3e6c7f6 100644
--- a/src/www/account/lostlogin.php
+++ b/src/www/account/lostlogin.php
@@ -56,7 +56,7 @@ if (!$u || !is_object($u)) {
} elseif ($u->isError()) {
exit_error($u->getErrorMessage(),'my');
} elseif (($u->getStatus() == 'S') || ($u->getStatus() == 'D')) {
- exit_error(_('Account is suspended or deleted','my'));
+ exit_error(_('Account is suspended or deleted'),'my');
}
if (getStringFromRequest("submit")) {
diff --git a/src/www/account/unsubscribe.php b/src/www/account/unsubscribe.php
index eec27b4..0d4c9ee 100644
--- a/src/www/account/unsubscribe.php
+++ b/src/www/account/unsubscribe.php
@@ -55,7 +55,7 @@ if (!$user || !is_object($user)) {
} elseif ($user->isError()) {
exit_error($user->getErrorMessage(),'my');
} elseif (($u->getStatus() == 'S') || ($u->getStatus() == 'D')) {
- exit_error(_('Account is suspended or deleted','my'));
+ exit_error(_('Account is suspended or deleted'),'my');
}
$all=getStringFromRequest('all');
diff --git a/src/www/account/verify.php b/src/www/account/verify.php
index de662e6..6736f59 100644
--- a/src/www/account/verify.php
+++ b/src/www/account/verify.php
@@ -53,7 +53,7 @@ if (getStringFromRequest('submit')) {
} elseif ($u->getStatus()=='A'){
$error_msg = _('Account already active.');
} elseif (($u->getStatus() == 'S') || ($u->getStatus() == 'D')) {
- $error_msg = _('Account is suspended or deleted','my');
+ $error_msg = _('Account is suspended or deleted');
} elseif ($confirm_hash != $u->getConfirmHash()) {
$error_msg = _('Cannot confirm account identity - invalid
confirmation hash (or login name)');
} elseif (!session_login_valid($loginname, $passwd, 1)) {
-----------------------------------------------------------------------
Summary of changes:
src/www/account/change_email-complete.php | 2 +-
src/www/account/lostlogin.php | 2 +-
src/www/account/unsubscribe.php | 2 +-
src/www/account/verify.php | 2 +-
4 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
