Ticket #2555: 0001-Change-criteria-to-search-for-lessons-file.patch

File 0001-Change-criteria-to-search-for-lessons-file.patch, 1.5 KB (added by godiard, 13 years ago)

  • mainscreen.py 

    From f00bb9f436c03c3f574abf50a8c446b0210e9118 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@sugarlabs.org>
Date: Fri, 31 Dec 2010 13:24:54 -0300
Subject: [PATCH] Change criteria to search for lessons file

Try to open a file speciffic to the cantry, a generic file for the locale or fallback to en_US lessons
---
 mainscreen.py |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mainscreen.py b/mainscreen.py
index 8a63ede..2762baf 100644
    a b class MainScreen(gtk.VBox): 
    7878       
    7979        # Load lessons for this language.
    8080        code = locale.getdefaultlocale()[0] or 'en_US'
    81         try:
    82             self.load_lessons('lessons/' + code + '.lessons')
    83 
    84         except:
    85             # Fallback to en_US lessons if none found.
    86             self.load_lessons('lessons/en_US.lessons')
     81        lessons_path = os.path.join(sugar.activity.activity.get_bundle_path(), 'lessons')
     82        lessons_file = os.path.join(lessons_path, code + '.lessons')
     83        if os.path.isfile(lessons_file):
     84            self.load_lessons(lessons_file)
     85        else:
     86            code = code[0:2]
     87            lessons_file = os.path.join(lessons_path, code + '.lessons')
     88            if os.path.isfile(lessons_file):
     89                self.load_lessons(lessons_file)
     90            else:
     91                # Fallback to en_US lessons if none found.
     92                self.load_lessons('lessons/en_US.lessons')
    8793
    8894        # We cannot run without lessons.
    8995        if not len(self.lessons):