Merge lp:~nataliabidart/ubuntu-sso-client/no-hardcode-appname into lp:ubuntu-sso-client

[Natalia Bidart]

- Do not hardcode the app_name when showing the TC_NOT_ACCEPTED message
  (LP: #TC_NOT_ACCEPTED).

[dobey (dobey)]

Can you use the new .format() notation for string formatting, as % notation is deprecated?

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

We should migrate the whole code to use .format(). I prefer to remain consistent with the current code.

[Natalia Bidart (nataliabidart)]

Reported bug #904960 to track the migration.

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2011-11-14 12:02:39 +0000
+++ ubuntu_sso/gtk/gui.py	2011-12-15 20:47:25 +0000
@@ -743,7 +743,7 @@
         # check T&C
         if not self.yes_to_tc_checkbutton.get_active():
             self._set_warning_message(self.tc_warning_label,
-                                      TC_NOT_ACCEPTED)
+                TC_NOT_ACCEPTED % {'app_name': self.app_name})
             error = True
 
         captcha_solution = self.captcha_solution_entry.get_text()

=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2011-11-11 17:12:19 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2011-12-15 20:47:25 +0000
@@ -1420,7 +1420,7 @@
         self.ui.join_ok_button.clicked()
 
         self.assert_correct_label_warning(self.ui.tc_warning_label,
-                                          gui.TC_NOT_ACCEPTED)
+            gui.TC_NOT_ACCEPTED % {'app_name': APP_NAME})
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_not_captcha_solution(self):

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2011-10-20 14:15:46 +0000
+++ ubuntu_sso/utils/ui.py	2011-12-15 20:47:25 +0000
@@ -88,8 +88,8 @@
 SUCCESS = _('You are now logged into %(app_name)s.')
 SURNAME_ENTRY = _('Surname')
 TC_BUTTON = _('Show Terms & Conditions')
-TC_NOT_ACCEPTED = _('Agreeing to the Ubuntu One Terms & Conditions is ' \
-                        'required to subscribe.')
+TC_NOT_ACCEPTED = _('Agreeing to the %(app_name)s Terms & Conditions is ' \
+                    'required to subscribe.')
 TOS_LABEL = _("You can also find these terms at <a href='%(url)s'>%(url)s</a>")
 TRY_AGAIN_BUTTON = _('Try again')
 UNKNOWN_ERROR = _('There was an error when trying to complete the ' \