Earlier, the "Registration failed" message seemed more like a threat. The new message sounds more like an information-conveying one.
The new message is :: Primary (title) : ------------------ No School Server found on the network Secondary (details) : ---------------------- Please ensure that you are connected to the correct network and that the server is available. ================ CHANGELOG ================ Changes of version-2 over version-1 : ------------------------------------- Unified another patch into version-1, that set the secondary message. Bernie, thanks a ton .... src/jarabe/desktop/favoritesview.py | 2 +- 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 81e32c8..e9c87ea 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -337,7 +337,7 @@ class FavoritesView(hippo.Canvas): 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 403897b..b9b8830 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) -- 1.7.4.4 _______________________________________________ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel