From c3a7e5872ed2b60c6f62ed506568e41d4f04b8f7 Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@sugarlabs.org>
Date: Tue, 08 Nov 2011 22:51:13 +0000
Subject: AU#694: More friendly message when not able to connect to XS

Signed-off-by: Ajay Garg <ajay@sugarlabs.org>
Authored-by: Ajay Garg <ajay@sugarlabs.org>
Signed-off-by: Anish Mangal <anish@sugarlabs.org>
---
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)
 
--
cgit v0.9.1