Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2013-12-14 02:26:02 (GMT)
committer Walter Bender <walter@sugarlabs.org>2013-12-14 02:26:02 (GMT)
commit7211628a463526d64bebfceb17b1f5fdca2ac33b (patch)
tree42c4851d34faa55982810b99788d8c5365bacb83
parent9fe7a02b423b78fa900f3aa7b8b5e895b1620e27 (diff)
better defaults for lang
-rw-r--r--pippy_app.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/pippy_app.py b/pippy_app.py
index 3205c54..87e3ae3 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -204,8 +204,15 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
root = os.path.join(get_bundle_path(), 'data')
# get preferred language and default one
+ print _default_lang
+
self.pref_lang = self.get_languages()[0].split("_")[0]
- self.default_lang = _default_lang.split("_")[0]
+ if len(_default_lang) == 0 or _default_lang[0] is None:
+ self.default_lang = 'en'
+ else:
+ self.default_lang = _default_lang.split("_")[0]
+
+ print self.pref_lang, self.default_lang
# construct the path for both
self.lang_path = os.path.join(root, self.pref_lang)
@@ -326,6 +333,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
path = os.path.join(os.environ.get('HOME', ''), '.i18n')
if not os.access(path, os.R_OK):
logging.debug('Could not access ~/.i18n')
+ print _default_lang
fd = open(path, 'w')
fd.write('LANG="%s"\n' % _default_lang)
fd.write('LANGUAGE="%s"\n' % _default_lang)
@@ -337,6 +345,7 @@ class PippyActivity(ViewSourceActivity, groupthink.sugar_tools.GroupActivity):
fd.close()
langlist = None
+ lang = 'en'
for line in lines:
if line.startswith('LANGUAGE='):