[ckan-changes] commit/ckan: dread: [controllers][s]: #1194 Welcome back messag reworded.

Mon Sep 26 16:08:29 UTC 2011

1 new changeset in ckan:

http://bitbucket.org/okfn/ckan/changeset/49e2c05e69ea/
changeset:   49e2c05e69ea
user:        dread
date:        2011-09-26 18:08:17
summary:     [controllers][s]: #1194 Welcome back messag reworded.
affected #:  2 files (-1 bytes)

--- a/ckan/controllers/user.py	Mon Sep 26 16:44:22 2011 +0100
+++ b/ckan/controllers/user.py	Mon Sep 26 17:08:17 2011 +0100
@@ -255,7 +255,7 @@
             response.set_cookie("ckan_user", user_dict['name'], max_age=cookie_timeout)
             response.set_cookie("ckan_display_name", user_dict['display_name'], max_age=cookie_timeout)
             response.set_cookie("ckan_apikey", user_dict['apikey'], max_age=cookie_timeout)
-            h.flash_success(_("Welcome back, %s") % user_dict['display_name'])
+            h.flash_success(_("%s is now logged in") % user_dict['display_name'])
             return self.me()
         else:
             h.flash_error('Login failed. Bad username or password.')


--- a/ckan/tests/functional/test_user.py	Mon Sep 26 16:44:22 2011 +0100
+++ b/ckan/tests/functional/test_user.py	Mon Sep 26 17:08:17 2011 +0100
@@ -176,7 +176,7 @@
         assert_equal(res.header('Location'), 'http://localhost/user/testlogin')
         res = res.follow()
         assert_equal(res.status, 200)
-        assert 'Welcome back, testlogin' in res.body
+        assert 'testlogin is now logged in' in res.body
         assert 'My Account' in res.body
         
         # check user object created

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


