From bfd3f904fa865e0eb580817978e1ec269ee4ddad Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 13 Aug 2009 14:25:57 +0000
Subject: Bug while starting the turtle activity #1164

---
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 91f7983..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,106 +0,0 @@
-TODO
-COPYING
-NEWS
-setup.py
-typingturtle.py
-keyboard.py
-titlescene.py
-lessonscreen.py
-medalscreen.py
-mainscreen.py
-balloongame.py
-lessonbuilder.py
-activity/Activity-typingturtle.svg
-activity/activity.info
-po/TypingTurtle.pot
-images/no-medal.svg
-images/bronze-medal.svg
-images/silver-medal.svg
-images/gold-medal.svg
-images/main-background.jpg
-images/OLPC_Rhand_M.svg
-images/OLPC_Rhand_HOMEROW.svg
-images/OLPC_Rhand_APOSTROPHE.svg
-images/OLPC_Rhand_H.svg
-images/OLPC_Rhand_U.svg
-images/OLPC_Rhand_SEMICOLON.svg
-images/OLPC_Rhand_SHIFT.svg
-images/OLPC_Lhand_H.svg
-images/OLPC_Lhand_B.svg
-images/OLPC_Rhand_I.svg
-images/OLPC_Rhand_PERIOD.svg
-images/OLPC_Lhand_S.svg
-images/OLPC_Lhand_HOMEROW.svg
-images/OLPC_Rhand_N.svg
-images/OLPC_Lhand_W.svg
-images/OLPC_Lhand_A.svg
-images/OLPC_Rhand_K.svg
-images/OLPC_Lhand_F.svg
-images/OLPC_Lhand_V.svg
-images/OLPC_Rhand_L.svg
-images/OLPC_Lhand_SPACE.svg
-images/OLPC_Lhand_G.svg
-images/OLPC_Lhand_SHIFT.svg
-images/OLPC_Lhand_Z.svg
-images/OLPC_Lhand_Q.svg
-images/OLPC_Rhand_J.svg
-images/OLPC_Rhand_ENTER.svg
-images/OLPC_Rhand_P.svg
-images/OLPC_Rhand_Y.svg
-images/OLPC_Lhand_E.svg
-images/OLPC_Rhand_SPACE.svg
-images/OLPC_Lhand_R.svg
-images/OLPC_Lhand_T.svg
-images/OLPC_Lhand_D.svg
-images/OLPC_Lhand_X.svg
-images/OLPC_Rhand_COMMA.svg
-images/OLPC_Rhand_QUESTIONMARK.svg
-images/OLPC_Lhand_C.svg
-images/OLPC_Rhand_O.svg
-lessons/en_US/MAKELESSONS
-lessons/en_US/badwords.txt
-lessons/en_US/bottomrow.lesson
-lessons/en_US/intro.lesson
-lessons/en_US/toprow.lesson
-lessons/en_US/homerow.lesson
-lessons/en_US/rightcapital.lesson
-lessons/en_US/leftcapital.lesson
-lessons/en_US/homerowgame.lesson
-lessons/en_US/leftcapitalgame.lesson
-lessons/en_US/toprowgame.lesson
-lessons/en_US/rightcapitalgame.lesson
-lessons/en_US/5desk.txt
-lessons/en_US/bottomrowgame.lesson
-lessons/ne_NP/MAKELESSONS
-lessons/ne_NP/intro.lesson
-lessons/ne_NP/toprow.lesson
-lessons/ne_NP/README_ne_NP.txt
-lessons/ne_NP/homerow.lesson
-lessons/ne_NP/ne_NP.txt
-lessons/ne_NP/homerowballoon.lesson
-lessons/ne_NP/rightcapital.lesson
-lessons/ne_NP/bottomrow.lesson
-lessons/ne_NP/leftcapital.lesson
-locale/ne_NP/activity.linfo
-locale/ne_NP/LC_MESSAGES/org.laptop.community.TypingTurtle.mo
-po/ne_NP.po
-keybuilder.py
-lessons/en_US/en_US.key
-lessons/ne_NP/ne_NP.key
-images/OLPC_Lhand_tilde.svg
-images/OLPC_Lhand_4.svg
-images/OLPC_Lhand_1.svg
-images/OLPC_Lhand_3.svg
-images/OLPC_Rhand_7.svg
-images/OLPC_Rhand_6.svg
-images/OLPC_Rhand_backslash.svg
-images/OLPC_Rhand_9.svg
-images/OLPC_Rhand_8.svg
-images/OLPC_Rhand_0.svg
-images/OLPC_Lhand_5.svg
-images/OLPC_Rhand_bracketL.svg
-images/OLPC_Rhand_bracketR.svg
-images/OLPC_Rhand_erase.svg
-images/OLPC_Rhand_minus.svg
-images/OLPC_Rhand_plus.svg
-images/OLPC_Lhand_2.svg
diff --git a/lessonbuilder.py b/lessonbuilder.py
index 40c140e..d1e9b4d 100755
--- a/lessonbuilder.py
+++ b/lessonbuilder.py
@@ -303,7 +303,7 @@ def build_key_steps(
     kb = keyboard.KeyboardData()
 
     # Attempt to load a letter map for the current locale.
-    code = locale.getdefaultlocale()[0]
+    code = locale.getdefaultlocale()[0] or 'en_US'
     try:
         kb.load_letter_map('lessons/%s/%s.key' % (code, code))
     except:
diff --git a/lessonscreen.py b/lessonscreen.py
index 3177dd5..884ad3c 100644
--- a/lessonscreen.py
+++ b/lessonscreen.py
@@ -127,7 +127,7 @@ class LessonScreen(gtk.VBox):
         self.keyboard = keyboard.KeyboardWidget(self.keyboard_images, self.activity)
         
         # Attempt to load a letter map for the current locale.
-        code = locale.getdefaultlocale()[0]
+        code = locale.getdefaultlocale()[0] or 'en_US'
         try:
             self.keyboard.load_letter_map('lessons/%s/%s.key' % (code, code))
         except:
diff --git a/mainscreen.py b/mainscreen.py
index db20094..988a8f9 100644
--- a/mainscreen.py
+++ b/mainscreen.py
@@ -77,7 +77,7 @@ class MainScreen(gtk.VBox):
         lessonbtn.modify_bg(gtk.STATE_NORMAL, self.get_colormap().alloc_color('#60b060'))
         
         # Load lessons for this language.
-        code = locale.getdefaultlocale()[0]
+        code = locale.getdefaultlocale()[0] or 'en_US'
         self.load_lessons('lessons/' + code)
 
         # Fallback to en_US lessons if none found.
--
cgit v0.9.1