Merge lp:~diegosarmentero/ubuntu-sso-client/forgotten-link into lp:ubuntu-sso-client

[Diego Sarmentero]

- Making LINK_STYLE to be unicode (LP: #950953).

[Natalia Bidart (nataliabidart)]

Looks great! Thanks for catching this :-)

review: Approve

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-03-05 18:56:50 +0000
+++ ubuntu_sso/qt/__init__.py	2012-03-09 19:08:35 +0000
@@ -19,7 +19,7 @@
 import collections
 
 
-LINK_STYLE = ('<a href="{link_url}">'
+LINK_STYLE = (u'<a href="{link_url}">'
               '<span style="color:#df2d1f;">{link_text}</span></a>')
 ERROR_ALL = '__all__'
 ERROR_STYLE = u'<font color="#df2d1f"><b>%s</b></font>'

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-03-05 21:08:40 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-03-09 19:08:35 +0000
@@ -52,6 +52,16 @@
         self.assertTrue(button.properties['default'])
         self.assertFalse(button.isEnabled())
 
+    def test_unicode_in_forgotten_password_link(self):
+        """Ensure that this label supports unicode."""
+        forgot_fr = u"J'ai oublié mon mot de passe"
+        self.patch(gui, "FORGOTTEN_PASSWORD_BUTTON", forgot_fr)
+        forgotten_text = gui.LINK_STYLE.format(link_url='#',
+                            link_text=forgot_fr)
+        self.ui._set_translated_strings()
+        self.assertEqual(unicode(self.ui.ui.forgot_password_label.text()),
+            forgotten_text)
+
     def test_set_translated_strings(self):
         """Test the translated string method."""
         expected = gui.LOGIN_TITLE.format(app_name=self.app_name)