Merge branch 'feature/translation-fixes' into develop

9 files changed, 94 insertions, 62 deletions

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 55ecfa79..41f4c541 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -195,7 +195,7 @@ class EIPConductorAppMixin(object):
             else:
                 # no errors, so go on.
                 if self.debugmode:
-                    self.startStopButton.setText('&Disconnect')
+                    self.startStopButton.setText(self.tr('&Disconnect'))
                 self.eip_service_started = True
                 self.toggleEIPAct()
 
@@ -209,7 +209,7 @@ class EIPConductorAppMixin(object):
             self.network_checker.stop()
             self.conductor.disconnect()
             if self.debugmode:
-                self.startStopButton.setText('&Connect')
+                self.startStopButton.setText(self.tr('&Connect'))
             self.eip_service_started = False
             self.toggleEIPAct()
             self.timer.stop()
diff --git a/src/leap/baseapp/log.py b/src/leap/baseapp/log.py
index 8a7f81c3..95cfc918 100644
--- a/src/leap/baseapp/log.py
+++ b/src/leap/baseapp/log.py
@@ -21,7 +21,7 @@ class LogPaneMixin(object):
         logging_layout = QtGui.QVBoxLayout()
         self.logbrowser = QtGui.QTextBrowser()
 
-        startStopButton = QtGui.QPushButton("&Connect")
+        startStopButton = QtGui.QPushButton(self.tr("&Connect"))
         self.startStopButton = startStopButton
 
         logging_layout.addWidget(self.logbrowser)
@@ -34,7 +34,7 @@ class LogPaneMixin(object):
         grid = QtGui.QGridLayout()
 
         self.updateTS = QtGui.QLabel('')
-        self.status_label = QtGui.QLabel('Disconnected')
+        self.status_label = QtGui.QLabel(self.tr('Disconnected'))
         self.ip_label = QtGui.QLabel('')
         self.remote_label = QtGui.QLabel('')
 
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index 93fab716..77eb3fe9 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -75,7 +75,8 @@ class StatusAwareTrayIconMixin(object):
                 self.iconpath['connected'])),
         self.ConnectionWidgets = con_widgets
 
-        self.statusIconBox = QtGui.QGroupBox("EIP Connection Status")
+        self.statusIconBox = QtGui.QGroupBox(
+            self.tr("EIP Connection Status"))
         statusIconLayout = QtGui.QHBoxLayout()
         statusIconLayout.addWidget(self.ConnectionWidgets['disconnected'])
         statusIconLayout.addWidget(self.ConnectionWidgets['connecting'])
@@ -83,7 +84,8 @@ class StatusAwareTrayIconMixin(object):
         statusIconLayout.itemAt(1).widget().hide()
         statusIconLayout.itemAt(2).widget().hide()
 
-        self.leapConnStatus = QtGui.QLabel("<b>disconnected</b>")
+        self.leapConnStatus = QtGui.QLabel(
+            self.tr("<b>disconnected</b>"))
         statusIconLayout.addWidget(self.leapConnStatus)
 
         self.statusIconBox.setLayout(statusIconLayout)
@@ -113,26 +115,32 @@ class StatusAwareTrayIconMixin(object):
         #self.trayIconMenu.customContextMenuRequested.connect(
             #self.on_context_menu)
 
-    def bad(self):
-        logger.error('this should not be called')
+    #def bad(self):
+        #logger.error('this should not be called')
 
     def createActions(self):
         """
         creates actions to be binded to tray icon
         """
         # XXX change action name on (dis)connect
-        self.connAct = QtGui.QAction("Encryption ON     turn &off", self,
-                                     triggered=lambda: self.start_or_stopVPN())
-
-        self.detailsAct = QtGui.QAction("&Details...",
-                                        self,
-                                        triggered=self.detailsWin)
-        self.aboutAct = QtGui.QAction("&About", self,
-                                      triggered=self.about)
-        self.aboutQtAct = QtGui.QAction("About Q&t", self,
-                                        triggered=QtGui.qApp.aboutQt)
-        self.quitAction = QtGui.QAction("&Quit", self,
-                                        triggered=self.cleanupAndQuit)
+        self.connAct = QtGui.QAction(
+            self.tr("Encryption ON     turn &off"),
+            self,
+            triggered=lambda: self.start_or_stopVPN())
+
+        self.detailsAct = QtGui.QAction(
+            self.tr("&Details..."),
+            self,
+            triggered=self.detailsWin)
+        self.aboutAct = QtGui.QAction(
+            self.tr("&About"), self,
+            triggered=self.about)
+        self.aboutQtAct = QtGui.QAction(
+            self.tr("About Q&t"), self,
+            triggered=QtGui.qApp.aboutQt)
+        self.quitAction = QtGui.QAction(
+            self.tr("&Quit"), self,
+            triggered=self.cleanupAndQuit)
 
     def toggleEIPAct(self):
         # this is too simple by now.
@@ -141,15 +149,17 @@ class StatusAwareTrayIconMixin(object):
         icon_status = self.conductor.get_icon_name()
         if icon_status == "connected":
             self.connAct.setEnabled(True)
-            self.connAct.setText('Encryption ON    turn o&ff')
+            self.connAct.setText(
+                self.tr('Encryption ON    turn o&ff'))
             return
         if icon_status == "disconnected":
             self.connAct.setEnabled(True)
-            self.connAct.setText('Encryption OFF   turn &on')
+            self.connAct.setText(
+                self.tr('Encryption OFF   turn &on'))
             return
         if icon_status == "connecting":
             self.connAct.setDisabled(True)
-            self.connAct.setText('connecting...')
+            self.connAct.setText(self.tr('connecting...'))
             return
 
     def detailsWin(self):
@@ -164,14 +174,15 @@ class StatusAwareTrayIconMixin(object):
     def about(self):
         # move to widget
         flavor = BRANDING.get('short_name', None)
-        content = ("LEAP client<br>"
-                   "(version <b>%s</b>)<br>" % VERSION)
+        content = self.tr(
+            ("LEAP client<br>"
+             "(version <b>%s</b>)<br>" % VERSION))
         if flavor:
             content = content + ('<br>Flavor: <i>%s</i><br>' % flavor)
         content = content + (
             "<br><a href='https://leap.se/'>"
             "https://leap.se</a>")
-        QtGui.QMessageBox.about(self, "About", content)
+        QtGui.QMessageBox.about(self, self.tr("About"), content)
 
     def setConnWidget(self, icon_name):
         oldlayout = self.statusIconBox.layout()
@@ -209,6 +220,7 @@ class StatusAwareTrayIconMixin(object):
             # is failing in a way beyond my understanding.
             # (not working the first time it's clicked).
             # this works however.
+            # XXX in osx it shows some glitches.
             context_menu.exec_(self.trayIcon.geometry().center())
 
     @QtCore.pyqtSlot()
diff --git a/src/leap/eip/exceptions.py b/src/leap/eip/exceptions.py
index 41eed77a..c127a58f 100644
--- a/src/leap/eip/exceptions.py
+++ b/src/leap/eip/exceptions.py
@@ -33,6 +33,7 @@ TODO:
 
 """
 from leap.base.exceptions import LeapException
+from leap.util.translations import translate
 
 
 # This should inherit from LeapException
@@ -62,53 +63,69 @@ class Warning(EIPClientError):
 
 class EIPNoPolkitAuthAgentAvailable(CriticalError):
     message = "No polkit authentication agent could be found"
-    usermessage = ("We could not find any authentication "
-                   "agent in your system.<br/>"
-                   "Make sure you have "
-                   "<b>polkit-gnome-authentication-agent-1</b> "
-                   "running and try again.")
+    usermessage = translate(
+        "EIPErrors",
+        "We could not find any authentication "
+        "agent in your system.<br/>"
+        "Make sure you have "
+        "<b>polkit-gnome-authentication-agent-1</b> "
+        "running and try again.")
 
 
 class EIPNoPkexecAvailable(Warning):
     message = "No pkexec binary found"
-    usermessage = ("We could not find <b>pkexec</b> in your "
-                   "system.<br/> Do you want to try "
-                   "<b>setuid workaround</b>? "
-                   "(<i>DOES NOTHING YET</i>)")
+    usermessage = translate(
+        "EIPErrors",
+        "We could not find <b>pkexec</b> in your "
+        "system.<br/> Do you want to try "
+        "<b>setuid workaround</b>? "
+        "(<i>DOES NOTHING YET</i>)")
     failfirst = True
 
 
 class EIPNoCommandError(EIPClientError):
     message = "no suitable openvpn command found"
-    usermessage = ("No suitable openvpn command found. "
-                   "<br/>(Might be a permissions problem)")
+    usermessage = translate(
+        "EIPErrors",
+        "No suitable openvpn command found. "
+        "<br/>(Might be a permissions problem)")
 
 
 class EIPBadCertError(Warning):
     # XXX this should be critical and fail close
     message = "cert verification failed"
-    usermessage = "there is a problem with provider certificate"
+    usermessage = translate(
+        "EIPErrors",
+        "there is a problem with provider certificate")
 
 
 class LeapBadConfigFetchedError(Warning):
     message = "provider sent a malformed json file"
-    usermessage = "an error occurred during configuratio of leap services"
+    usermessage = translate(
+        "EIPErrors",
+        "an error occurred during configuratio of leap services")
 
 
 class OpenVPNAlreadyRunning(EIPClientError):
     message = "Another OpenVPN Process is already running."
-    usermessage = ("Another OpenVPN Process has been detected."
-                   "Please close it before starting leap-client")
+    usermessage = translate(
+        "EIPErrors",
+        "Another OpenVPN Process has been detected."
+        "Please close it before starting leap-client")
 
 
 class HttpsNotSupported(LeapException):
     message = "connection refused while accessing via https"
-    usermessage = "Server does not allow secure connections."
+    usermessage = translate(
+        "EIPErrors",
+        "Server does not allow secure connections")
 
 
 class HttpsBadCertError(LeapException):
     message = "verification error on cert"
-    usermessage = "Server certificate could not be verified."
+    usermessage = translate(
+        "EIPErrors",
+        "Server certificate could not be verified")
 
 #
 # errors still needing some love
@@ -117,7 +134,9 @@ class HttpsBadCertError(LeapException):
 
 class EIPInitNoKeyFileError(CriticalError):
     message = "No vpn keys found in the expected path"
-    usermessage = "We could not find your eip certs in the expected path"
+    usermessage = translate(
+        "EIPErrors",
+        "We could not find your eip certs in the expected path")
 
 
 class EIPInitBadKeyFilePermError(Warning):
diff --git a/src/leap/gui/firstrun/last.py b/src/leap/gui/firstrun/last.py
index 1d8caca4..e097b2ae 100644
--- a/src/leap/gui/firstrun/last.py
+++ b/src/leap/gui/firstrun/last.py
@@ -15,7 +15,7 @@ class LastPage(QtGui.QWizardPage):
     def __init__(self, parent=None):
         super(LastPage, self).__init__(parent)
 
-        self.setTitle("Connecting to Encrypted Internet Proxy service...")
+        self.setTitle(self.tr("Connecting to Encrypted Internet Proxy service..."))
 
         self.setPixmap(
             QtGui.QWizard.LogoPixmap,
@@ -51,13 +51,13 @@ class LastPage(QtGui.QWizardPage):
             statusline.setText(status)
 
     def set_finished_status(self):
-        self.setTitle('You are now using an encrypted connection!')
+        self.setTitle(self.tr('You are now using an encrypted connection!'))
         finishText = self.wizard().buttonText(
             QtGui.QWizard.FinishButton)
         finishText = finishText.replace('&', '')
-        self.label.setText(
+        self.label.setText(self.tr(
             "Click '<i>%s</i>' to end the wizard and "
-            "save your settings." % finishText)
+            "save your settings." % finishText))
         # XXX init network checker
         # trigger signal
 
diff --git a/src/leap/gui/firstrun/login.py b/src/leap/gui/firstrun/login.py
index 6bf0605d..e39eecc0 100644
--- a/src/leap/gui/firstrun/login.py
+++ b/src/leap/gui/firstrun/login.py
@@ -21,8 +21,8 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
         super(LogInPage, self).__init__(parent)
         self.current_page = "login"
 
-        self.setTitle("Log In")
-        self.setSubTitle("Log in with your credentials.")
+        self.setTitle(self.tr("Log In"))
+        self.setSubTitle(self.tr("Log in with your credentials."))
         self.current_page = "login"
 
         self.setPixmap(
@@ -35,7 +35,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
         self.do_confirm_next = False
 
     def setupUI(self):
-        userNameLabel = QtGui.QLabel("User &name:")
+        userNameLabel = QtGui.QLabel(self.tr("User &name:"))
         userNameLineEdit = QtGui.QLineEdit()
         userNameLineEdit.cursorPositionChanged.connect(
             self.reset_validation_status)
@@ -50,7 +50,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
             #'username@provider.example.org')
         self.userNameLineEdit = userNameLineEdit
 
-        userPasswordLabel = QtGui.QLabel("&Password:")
+        userPasswordLabel = QtGui.QLabel(self.tr("&Password:"))
         self.userPasswordLineEdit = QtGui.QLineEdit()
         self.userPasswordLineEdit.setEchoMode(
             QtGui.QLineEdit.Password)
@@ -77,7 +77,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn):  # InlineValidationPage
         layout.addWidget(self.valFrame, 4, 2, 4, 2)
         self.valFrame.hide()
 
-        self.nextText("Log in")
+        self.nextText(self.tr("Log in"))
         self.setLayout(layout)
 
         #self.registerField('is_login_wizard')
diff --git a/src/leap/gui/firstrun/providerselect.py b/src/leap/gui/firstrun/providerselect.py
index 62742181..28fb829c 100644
--- a/src/leap/gui/firstrun/providerselect.py
+++ b/src/leap/gui/firstrun/providerselect.py
@@ -101,7 +101,7 @@ class SelectProviderPage(InlineValidationPage):
         self.certInfo.setWordWrap(True)
         self.certWarning = QtGui.QLabel("")
         self.trustProviderCertCheckBox = QtGui.QCheckBox(
-            "&Trust this provider certificate.")
+            self.tr("&Trust this provider certificate."))
 
         self.trustProviderCertCheckBox.stateChanged.connect(
             self.onTrustCheckChanged)
@@ -344,9 +344,10 @@ class SelectProviderPage(InlineValidationPage):
 
     def add_cert_info(self, certinfo):  # pragma: no cover XXX
         self.certWarning.setText(
-            "Do you want to <b>trust this provider certificate?</b>")
+            self.tr("Do you want to <b>trust this provider certificate?</b>"))
+        # XXX Check if this needs to abstracted to remove certinfo
         self.certInfo.setText(
-            'SHA-256 fingerprint: <i>%s</i><br>' % certinfo)
+            self.tr('SHA-256 fingerprint: <i>%s</i><br>' % certinfo))
         self.certInfo.setWordWrap(True)
         self.certinfoGroup.show()
 
diff --git a/src/leap/gui/firstrun/register.py b/src/leap/gui/firstrun/register.py
index 4c811093..b04638e0 100644
--- a/src/leap/gui/firstrun/register.py
+++ b/src/leap/gui/firstrun/register.py
@@ -45,7 +45,7 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
         self.focused_field = False
 
     def setupUI(self):
-        userNameLabel = QtGui.QLabel("User &name:")
+        userNameLabel = QtGui.QLabel(self.tr("User &name:"))
         userNameLineEdit = QtGui.QLineEdit()
         userNameLineEdit.cursorPositionChanged.connect(
             self.reset_validation_status)
@@ -57,20 +57,20 @@ class RegisterUserPage(InlineValidationPage, UserFormMixIn):
             QtGui.QRegExpValidator(usernameRe, self))
         self.userNameLineEdit = userNameLineEdit
 
-        userPasswordLabel = QtGui.QLabel("&Password:")
+        userPasswordLabel = QtGui.QLabel(self.tr("&Password:"))
         self.userPasswordLineEdit = QtGui.QLineEdit()
         self.userPasswordLineEdit.setEchoMode(
             QtGui.QLineEdit.Password)
         userPasswordLabel.setBuddy(self.userPasswordLineEdit)
 
-        userPassword2Label = QtGui.QLabel("Password (again):")
+        userPassword2Label = QtGui.QLabel(self.tr("Password (again):"))
         self.userPassword2LineEdit = QtGui.QLineEdit()
         self.userPassword2LineEdit.setEchoMode(
             QtGui.QLineEdit.Password)
         userPassword2Label.setBuddy(self.userPassword2LineEdit)
 
         rememberPasswordCheckBox = QtGui.QCheckBox(
-            "&Remember username and password.")
+            self.tr("&Remember username and password."))
         rememberPasswordCheckBox.setChecked(True)
 
         self.registerField('userName*', self.userNameLineEdit)
diff --git a/src/leap/gui/firstrun/regvalidation.py b/src/leap/gui/firstrun/regvalidation.py
index b86583e0..6135a290 100644
--- a/src/leap/gui/firstrun/regvalidation.py
+++ b/src/leap/gui/firstrun/regvalidation.py
@@ -31,9 +31,9 @@ class RegisterUserValidationPage(ValidationPage):
         super(RegisterUserValidationPage, self).__init__(parent)
         self.current_page = "signupvalidation"
 
-        title = "Connecting..."
+        title = self.tr("Connecting...")
         # XXX uh... really?
-        subtitle = "Checking connection with provider."
+        subtitle = self.tr("Checking connection with provider.")
 
         self.setTitle(title)
         self.setSubTitle(subtitle)