Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-647189 into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Fix typo and improve text on logout page.

This branch fixes typo in table header and also provides better text message on the logout page.

[Ricardo Kirkner (ricardokirkner)]

The change looks good, provided the tests are passing, I approve.

review: Approve

[Ricardo Kirkner (ricardokirkner)]

Actually, I take that back. A test that ensures that the branding object has the logout attribute would be nice.

review: Needs Fixing

[Ricardo Kirkner (ricardokirkner)]

Ok, thanks.

review: Approve

=== modified file 'identityprovider/branding.py'
--- identityprovider/branding.py	2010-08-26 09:50:39 +0000
+++ identityprovider/branding.py	2010-09-28 15:13:42 +0000
@@ -25,6 +25,9 @@
                         'correctly and try again.')
     oops_error = _('Sorry, something just went wrong in Launchpad Login '
                    'Service.')
+    logout = _('You are now logged out of the Launchpad Login Service '
+               'website. However, you have not been automatically logged '
+               'out of every website that uses this website.')
 
 
 class Ubuntu(object):
@@ -47,5 +50,8 @@
                         'address correctly and try again.')
     oops_error = _('Sorry, something just went wrong in Ubuntu Single Sign '
                    'On.')
+    logout = _('You are now logged out of the Ubuntu Single Sign On (SSO) '
+               'website. However, you have not been automatically logged '
+               'out of every website that uses this SSO website.')
 
 current_brand = globals()[settings.BRAND]()

=== modified file 'identityprovider/templates/registration/logout.html'
--- identityprovider/templates/registration/logout.html	2010-09-21 17:09:05 +0000
+++ identityprovider/templates/registration/logout.html	2010-09-28 15:13:42 +0000
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-    <p>{% trans "You have been logged out." %}
+    <p>{{ brand.logout }}
       {% if return_to_url %}
       {% blocktrans with return_to_url as url and return_to_site_name as site_name %}
      <span class="big">Return to <a href="{{ return_to_url }}">{{ site_name }}</a></span>{% endblocktrans %}
@@ -22,7 +22,7 @@
 
     {% if other_sites %}
      <div>
-       <h2 class="main">{% trans "Sites you may still be logged to" %}</h2>
+       <h2 class="main">{% trans "Sites you may still be logged into" %}</h2>
        <table class="listing">
         <thead>
           <tr>

=== added file 'identityprovider/tests/test_branding.py'
--- identityprovider/tests/test_branding.py	1970-01-01 00:00:00 +0000
+++ identityprovider/tests/test_branding.py	2010-09-28 15:13:42 +0000
@@ -0,0 +1,10 @@
+from unittest import TestCase
+
+from identityprovider.branding import Ubuntu, Launchpad
+
+
+class BrandingTestCase(TestCase):
+
+    def test_branding_class_has_logout_attribute(self):
+        self.assertTrue(hasattr(Ubuntu, 'logout'))
+        self.assertTrue(hasattr(Launchpad, 'logout'))