diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-05 15:15:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-05 15:15:34 -0300 |
| commit | aaaa0e34add8d89bc4697b6af2dca56c78a70133 (patch) | |
| tree | 3ba20d53688c784282793573454844e18b68edd1 /src/leap/bitmask/gui | |
| parent | f57c6788c306db597802ea6d3232116b8984f62f (diff) | |
| parent | 5ae44d80876aa9c1e60280fbf437ee687d9bc3c8 (diff) | |
Merge remote-tracking branch 'ivan/bug/4358_unhandled-error-during-register' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/wizard.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index 6ba65410..8de5802e 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -226,9 +226,7 @@ class Wizard(QtGui.QWizard): self._registration_finished) threads.deferToThread( - partial(register.register_user, - username.encode("utf8"), - password.encode("utf8"))) + partial(register.register_user, username, password)) self._username = username self._password = password @@ -282,7 +280,8 @@ class Wizard(QtGui.QWizard): old_username = self._username self._username = None self._password = None - error_msg = self.tr("Unknown error") + error_msg = self.tr("Something has gone wrong. " + "Please try again.") try: content, _ = get_content(req) json_content = json.loads(content) |