From a8580673b60b4467e844b25608d7e59aaa171876 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 30 Aug 2012 08:09:33 -0500 Subject: [PATCH] update link fixed, thanks Niphlod --- VERSION | 2 +- applications/admin/controllers/default.py | 4 ++-- applications/welcome/languages/default.py | 17 +++++++++++++++++ gluon/contrib/webclient.py | 1 + gluon/tests/test_web.py | 5 +++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c330710c..5046c345 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.2 (2012-08-30 08:05:05) stable +Version 2.0.2 (2012-08-30 08:09:29) stable diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index ccc36121..523af721 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -140,8 +140,8 @@ def check_version(): return SPAN('You should upgrade to version %s' % version_number) else: return sp_button(URL('upgrade_web2py'), T('upgrade now')) \ - + XML(' %s' % version_number) - + + XML(' %s.%s.%s' \ + % version_number[:3]) def logout(): """ Logout handler """ diff --git a/applications/welcome/languages/default.py b/applications/welcome/languages/default.py index 4586b206..31757f18 100644 --- a/applications/welcome/languages/default.py +++ b/applications/welcome/languages/default.py @@ -16,6 +16,7 @@ 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?', 'Buy this book': 'Buy this book', 'Cannot be empty': 'Cannot be empty', +'Check to delete': 'Check to delete', 'Client IP': 'Client IP', 'Community': 'Community', 'Components and Plugins': 'Components and Plugins', @@ -41,7 +42,9 @@ 'First name': 'First name', 'Forms and Validators': 'Forms and Validators', 'Free Applications': 'Free Applications', +'Group %(group_id)s created': 'Group %(group_id)s created', 'Group ID': 'Group ID', +'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s', 'Groups': 'Groups', 'Hello World': 'Hello World', 'Hello World ## comment': 'Hello World ', @@ -56,7 +59,11 @@ 'Layout Plugins': 'Layout Plugins', 'Layouts': 'Layouts', 'Live Chat': 'Live Chat', +'Logged in': 'Logged in', +'Logged out': 'Logged out', 'Login': 'Login', +'Logout': 'Logout', +'Lost Password': 'Lost Password', 'Lost password?': 'Lost password?', 'Menu Model': 'Menu Model', 'Modified By': 'Modified By', @@ -70,9 +77,12 @@ 'Other Recipes': 'Other Recipes', 'Overview': 'Overview', 'Password': 'Password', +"Password fields don't match": "Password fields don't match", +'please input your password again': 'please input your password again', 'Plugins': 'Plugins', 'Powered by': 'Powered by', 'Preface': 'Preface', +'Profile': 'Profile', 'Python': 'Python', 'Quick Examples': 'Quick Examples', 'Recipes': 'Recipes', @@ -80,6 +90,8 @@ 'Register': 'Register', 'Registration identifier': 'Registration identifier', 'Registration key': 'Registration key', +'Registration successful': 'Registration successful', +'Remember me (for 30 days)': 'Remember me (for 30 days)', 'Reset Password key': 'Reset Password key', 'Role': 'Role', 'Semantic': 'Semantic', @@ -92,7 +104,12 @@ 'This App': 'This App', 'Timestamp': 'Timestamp', 'Twitter': 'Twitter', +'User %(id)s Logged-in': 'User %(id)s Logged-in', +'User %(id)s Logged-out': 'User %(id)s Logged-out', +'User %(id)s Registered': 'User %(id)s Registered', 'User ID': 'User ID', +'value already in database or empty': 'value already in database or empty', +'Verify Password': 'Verify Password', 'Videos': 'Videos', 'View': 'View', 'Welcome': 'Welcome', diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py index 4bcfe7c8..b4ab242b 100644 --- a/gluon/contrib/webclient.py +++ b/gluon/contrib/webclient.py @@ -39,6 +39,7 @@ class WebClient(object): session_regex = SESSION_REGEX): self.app = app self.postbacks = postbacks + self.forms = {} self.history = [] self.cookies = {} self.default_headers = default_headers diff --git a/gluon/tests/test_web.py b/gluon/tests/test_web.py index 9d5e1448..54295c88 100644 --- a/gluon/tests/test_web.py +++ b/gluon/tests/test_web.py @@ -41,6 +41,11 @@ class TestWeb(unittest.TestCase): client.get('index') self.assertTrue('Welcome Homer' in client.text) + client = WebClient('http://127.0.0.1:8000/admin/default/') + client.post('index',data=dict(password='hello')) + client.get('site') + client.get('design/welcome') + if __name__ == '__main__': unittest.main()