diff options
| author | Ajay Garg <ajay@activitycentral.com> | 2012-10-18 11:50:54 (GMT) |
|---|---|---|
| committer | Ajay Garg <ajay@activitycentral.com> | 2012-10-18 11:56:19 (GMT) |
| commit | b007300f395f60d074873e71a11dfe99ffd1b01a (patch) | |
| tree | 0e6624ab6de0fba6371003e2b777229bf8b0c53e | |
| parent | 7ab0a9b69813659154ba5d2a908f7cfbb3e326aa (diff) | |
Friendlier messages, when registration with School-Server fails.
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 2 | ||||
| -rw-r--r-- | src/jarabe/desktop/schoolserver.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 037d759..6ef4d15 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -332,7 +332,7 @@ class FavoritesView(ViewContainer): try: schoolserver.register_laptop() except RegisterError, e: - alert.props.title = _('Registration Failed') + alert.props.title = _('No School Server found on the network') alert.props.msg = '%s' % e else: alert.props.title = _('Registration Successful') diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index cc26e56..2b8fa9a 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -140,7 +140,9 @@ def register_laptop(url=_REGISTER_URL): data = server.register(sn, nick, uuid_, profile.pubkey) except (xmlrpclib.Error, TypeError, socket.error): logging.exception('Registration: cannot connect to server') - raise RegisterError(_('Cannot connect to the server.')) + raise RegisterError(_('Please ensure that you are connected ' \ + 'to the correct network and that the ' \ + 'server is available.')) finally: socket.setdefaulttimeout(None) |