Merge lp:~mandel/ubuntu-sso-client/appname-ssl into lp:ubuntu-sso-client

[Manuel de la Peña]

Ensure that the strings used in sso do not have ubuntu one in them.

Ensure that the strings used in sso do not have ubuntu one in them.

[lp:~mandel/ubuntu-sso-client/appname-ssl]

899. By Manuel de la Peña on 2012-03-05

Make appname to never be empty since it will make the UI look terrible.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntu_sso/qt/ssl_dialog.py'
--- ubuntu_sso/qt/ssl_dialog.py	2012-02-29 14:28:56 +0000
+++ ubuntu_sso/qt/ssl_dialog.py	2012-03-05 16:35:19 +0000
@@ -35,6 +35,7 @@
 from ubuntu_sso.qt.ui.ssl_dialog_ui import Ui_SSLDialog
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
+    SSL_APPNAME_HELP,
     SSL_DETAILS_HELP,
     SSL_DIALOG_TITLE,
     SSL_DESCRIPTION,
@@ -64,7 +65,7 @@
 class SSLDialog(QDialog):
     """"Dialog used to show SSL exceptions."""
 
-    def __init__(self, domain=None, details=None, parent=None):
+    def __init__(self, app_name, domain=None, details=None, parent=None):
         """Create a new instance."""
         super(SSLDialog, self).__init__()
         if domain is None:
@@ -75,6 +76,7 @@
             logger.debug('Details passed as None.')
             details = ''
         self.details = details
+        self.app_name = app_name
         self.ssl_text = None
         self.expander = None
         self.ui = Ui_SSLDialog()
@@ -94,7 +96,8 @@
                                         second_reason=SSL_SECOND_REASON,
                                         third_reason=SSL_THIRD_REASON)
         self.ui.intro_label.setText(intro)
-        self.ui.not_sure_label.setText(SSL_NOT_SURE)
+        self.ui.not_sure_label.setText(SSL_NOT_SURE %
+                                       {'app_name': self.app_name})
         self.ui.remember_checkbox.setText(SSL_REMEMBER_DECISION)
 
     def _on_cancel_clicked(self):
@@ -142,6 +145,8 @@
         help=SSL_DOMAIN_HELP)
     parser.add_argument('--details', required=True,
         help=SSL_DETAILS_HELP)
+    parser.add_argument('--appname', required=True,
+        help=SSL_APPNAME_HELP)
     return parser.parse_args()
 
 
@@ -151,6 +156,6 @@
     app = QApplication(sys.argv)
     # pylint: enable=W0612
     args = parse_args()
-    win = SSLDialog(domain=args.domain, details=args.details)
+    win = SSLDialog(args.appname, domain=args.domain, details=args.details)
     return_code = win.exec_()
     sys.exit(return_code)

=== modified file 'ubuntu_sso/qt/tests/test_ssl_dialog.py'
--- ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-03-01 14:49:41 +0000
+++ ubuntu_sso/qt/tests/test_ssl_dialog.py	2012-03-05 16:35:19 +0000
@@ -24,6 +24,7 @@
 from ubuntu_sso.qt import ssl_dialog
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
+    SSL_APPNAME_HELP,
     SSL_DETAILS_HELP,
     SSL_DESCRIPTION,
     SSL_DOMAIN_HELP,
@@ -51,8 +52,10 @@
         yield super(SSLDialogTestCase, self).setUp()
         self.domain = 'test-domain'
         self.details = 'SSL details'
+        self.appname = 'test'
 
-        self.dialog = ssl_dialog.SSLDialog(domain=self.domain,
+        self.dialog = ssl_dialog.SSLDialog(self.appname,
+                                           domain=self.domain,
                                            details=self.details)
         self.return_code = None
 
@@ -64,13 +67,15 @@
 
     def test_init_none_domain(self):
         """Test the init method when the domain is none."""
-        dialog = ssl_dialog.SSLDialog(domain=None, details=self.details)
+        dialog = ssl_dialog.SSLDialog(self.appname, domain=None,
+                                      details=self.details)
         self.assertEqual(self.details, dialog.details)
         self.assertEqual('', dialog.domain)
 
     def test_init_none_details(self):
         """Test the init method when the details are none."""
-        dialog = ssl_dialog.SSLDialog(domain=self.domain, details=None)
+        dialog = ssl_dialog.SSLDialog(self.appname, domain=self.domain,
+                                      details=None)
         self.assertEqual('', dialog.details)
         self.assertEqual(self.domain, dialog.domain)
 
@@ -84,7 +89,7 @@
                                               second_reason=SSL_SECOND_REASON,
                                               third_reason=SSL_THIRD_REASON)
         self.assertEqual(intro, unicode(self.dialog.ui.intro_label.text()))
-        self.assertEqual(SSL_NOT_SURE,
+        self.assertEqual(SSL_NOT_SURE % dict(app_name=self.appname),
                 unicode(self.dialog.ui.not_sure_label.text()))
         self.assertEqual(SSL_REMEMBER_DECISION,
                 unicode(self.dialog.ui.remember_checkbox.text()))
@@ -119,7 +124,8 @@
         self.patch(ssl_dialog.SSLDialog, '_on_cancel_clicked',
                                           fake_on_cancel_clicked)
 
-        dialog = ssl_dialog.SSLDialog(domain=None, details=self.details)
+        dialog = ssl_dialog.SSLDialog(self.appname, domain=None,
+                                      details=self.details)
 
         dialog.ui.connect_button.clicked.emit(True)
         self.assertIn('_on_connect_clicked', called)
@@ -188,4 +194,6 @@
                                                          argparse.called)
         self.assertIn(('add_argument', '--details', True, SSL_DETAILS_HELP),
                                                           argparse.called)
+        self.assertIn(('add_argument', '--appname', True, SSL_APPNAME_HELP),
+                                                          argparse.called)
         self.assertIn(('parse_args',), argparse.called)

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-03-01 15:21:00 +0000
+++ ubuntu_sso/utils/ui.py	2012-03-05 16:35:19 +0000
@@ -125,6 +125,7 @@
 SET_UP_ACCOUNT_BUTTON = _('Set Up Account')
 SET_UP_ACCOUNT_CHOICE_BUTTON = _('I don\'t have an account yet - sign me up')
 SIGN_IN_BUTTON = _('Sign In')
+SSL_APPNAME_HELP = _('the appname whose ssl error we are going to show.')
 SSL_CERT_DETAILS = _('Certificate details')
 SSL_CONNECT_BUTTON = _('Connect')
 SSL_DETAILS_HELP = _('the details ssl certificate we are going to show.')
@@ -138,7 +139,7 @@
 SSL_HEADER = _('Do you want to connect to this server?')
 SSL_HELP_BUTTON = _('Get Help With SSL')
 SSL_NOT_SURE = _('If you are not sure about this server, do not use it to'
-                 ' connect to Ubuntu One.')
+                 ' connect to %(app_name)s.')
 SSL_REMEMBER_DECISION = _('Remember my settings for this certificate.')
 SSL_SECOND_REASON = _('The name on the certificate isn\'t valid or doesn\'t'
                       ' match the name of the site')