Merge lp:~ralsina/ubuntu-sso-client/fix_805461 into lp:ubuntu-sso-client

[Roberto Alsina]

Expand a couple of variables that were left as placeholders in a text.

Expand a couple of variables that were left as placeholders in a text.

[lp:~ralsina/ubuntu-sso-client/fix_805461]

732. By Roberto Alsina on 2011-07-04

Call _set_titles *after* the email_address field is set

[Alejandro J. Cura (alecu)]

Tested on windows, works as expected.

review: Approve

[lp:~ralsina/ubuntu-sso-client/fix_805461]

733. By Roberto Alsina on 2011-07-04

Don't use a private method

734. By Roberto Alsina on 2011-07-04

Style fix

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-06-29 22:19:49 +0000
+++ ubuntu_sso/qt/controllers.py	2011-07-04 19:54:40 +0000
@@ -405,6 +405,9 @@
             self.backend.register_user(self.view.wizard().app_name, email,
                                        password, name, captcha_id,
                                        captcha_solution)
+        # Update validation page's title, which contains the email
+        wizard = self.view.wizard()
+        wizard.page(wizard.email_verification_page_id).controller.set_titles()
 
     def is_correct_email(self, email_address):
         """Return if the email is correct."""
@@ -480,7 +483,18 @@
         """Set the different titles."""
         logger.debug('EmailVerificationController._set_titles')
         self.view.setTitle(VERIFY_EMAIL_TITLE)
-        self.view.setSubTitle(VERIFY_EMAIL_CONTENT)
+        self.view.setSubTitle(VERIFY_EMAIL_CONTENT % {
+            "app_name": self.view.wizard().app_name,
+            "email": self.view.wizard().field("email_address").toString(),
+            })
+
+    def set_titles(self):
+        """This class needs to have a public set_titles.
+
+        Since the subtitle contains data that is only known after SetupAccount
+        and _set_titles is only called on initialization.
+        """
+        self._set_titles()
 
     #pylint: disable=C0103
     @inlineCallbacks