diff options
Diffstat (limited to 'lessonbuilder.py')
| -rwxr-xr-x | lessonbuilder.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lessonbuilder.py b/lessonbuilder.py index 48dde12..76dd3ae 100755 --- a/lessonbuilder.py +++ b/lessonbuilder.py @@ -108,6 +108,8 @@ def load_wordlist(path): # intentional since we want to teach punctuation in its natural # form. words = RE_WHITESPACE.split(text) + + words = [w.split('/')[0] for w in words] return words @@ -237,7 +239,7 @@ def make_step(instructions, mode, text): return step def build_game_words( - new_keys, base_keys, + count, new_keys, base_keys, words, bad_words): all_keys = new_keys + base_keys @@ -249,7 +251,7 @@ def build_game_words( random.shuffle(good_words) - return good_words[:200] + return good_words[:count] def build_key_steps( count, new_keys, base_keys, @@ -305,9 +307,9 @@ def build_key_steps( # Attempt to load a letter map for the current locale. code = locale.getdefaultlocale()[0] or 'en_US' try: - kb.load_letter_map('lessons/%s/%s.key' % (code, code)) + kb.load_letter_map('lessons/%s.key' % code) except: - kb.load_letter_map('lessons/en_US/en_US.key') + kb.load_letter_map('lessons/en_US.key') kb.set_layout(keyboard.OLPC_LAYOUT) @@ -552,7 +554,7 @@ def main(): lesson['type'] = options.game lesson['length'] = options.length lesson['words'] = build_game_words( - new_keys=options.keys, base_keys=options.base_keys, + count=options.length, new_keys=options.keys, base_keys=options.base_keys, words=words, bad_words=bad_words) text = json.dumps(lesson, ensure_ascii=False, sort_keys=True, indent=4) |