Merge branch 'feature/translation-fixes' into develop

5 files changed, 19 insertions, 18 deletions

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)