allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [3/4] git commit: [#5700] Updated notification message
Date Mon, 29 Sep 2014 15:31:58 GMT
[#5700] Updated notification message


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/dfcee194
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/dfcee194
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/dfcee194

Branch: refs/heads/master
Commit: dfcee1942847661d94a0d1504163d3e82e029d24
Parents: b020149
Author: Alexander Luberg <aluberg@slashdotmedia.com>
Authored: Fri Sep 26 12:07:57 2014 -0700
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Mon Sep 29 15:31:41 2014 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/dfcee194/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 8944f74..ecd3d0c 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -183,7 +183,7 @@ class AuthController(BaseController):
         allow_non_primary_email_reset = asbool(config.get('auth.allow_non_primary_email_password_reset',
True))
 
         if not allow_non_primary_email_reset:
-            message = 'A password reset email has been sent, if the given email address is
on record as a primary email address.'
+            message = 'If the given email address is on record, a password reset email has
been sent to the account\'s primary email address.'
             email_record = M.EmailAddress.query.get(email=provider.get_primary_email_address(user_record=user_record),
                                                     confirmed=True)
         else:


Mime
View raw message