Differentiate Key and Text steps. Key steps are presented one key a time, indicating which finger is used. Text steps are traditional text copying. Key steps can be created using the Lesson Editor.

Updated the English lessons to use Key steps.
Added a little spacer between lines in Text steps.
Translation updates.

1 files changed, 36 insertions, 34 deletions

diff --git a/lessonbuilder.py b/lessonbuilder.py
index 76dd3ae..7f85c1c 100755
--- a/lessonbuilder.py
+++ b/lessonbuilder.py
@@ -231,7 +231,7 @@ def make_random_words(words, required_keys, keys, count):
         text += random.choice(words) + ' '
     return text.strip()
 
-def make_step(instructions, mode, text):
+def make_step(instructions, mode, text, type='text'):
     step = {}
     step['instructions'] = instructions
     step['text'] = text
@@ -326,40 +326,42 @@ def build_key_steps(
             % { 'keynames': keynames },
         'key', '\n'))
 
-    for letter in new_keys:
-        key, state, group = kb.get_key_state_group_for_letter(letter)
-
-        if not key:
-            error("There is no key combination in the current keymap for the '%s' letter. " % letter + \
-                  "Are you sure the keymap is set correctly?\n")
-
-        try:
-            finger = FINGERS[key['key-finger']]
-        except:
-            error("The '%s' letter (scan code %x) does not have a finger assigned." % (letter, key['key-scan']))
-
-        if state == gtk.gdk.SHIFT_MASK:
-            # Choose the finger to press the SHIFT key with.
-            if key['key-finger'][0] == 'R':
-                shift_finger = FINGERS['LP']
-            else:
-                shift_finger = FINGERS['RP']
-
-            instructions = _('Press and hold the SHIFT key with your %(finger)s finger, ') % { 'finger': shift_finger }
-            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
-
-        elif state == gtk.gdk.MOD5_MASK:
-            instructions = _('Press and hold the ALTGR key, ') 
-            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
-
-        elif state == gtk.gdk.SHIFT_MASK | gtk.gdk.MOD5_MASK:
-            instructions = _('Press and hold the ALTGR and SHIFT keys, ')
-            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
-
-        else:
-            instructions = _('Press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
+#    for letter in new_keys:
+#        key, state, group = kb.get_key_state_group_for_letter(letter)
+#
+#        if not key:
+#            error("There is no key combination in the current keymap for the '%s' letter. " % letter + \
+#                  "Are you sure the keymap is set correctly?\n")
+#
+#        try:
+#            finger = FINGERS[key['key-finger']]
+#        except:
+#            error("The '%s' letter (scan code %x) does not have a finger assigned." % (letter, key['key-scan']))
+#
+#        if state == gtk.gdk.SHIFT_MASK:
+#            # Choose the finger to press the SHIFT key with.
+#            if key['key-finger'][0] == 'R':
+#                shift_finger = FINGERS['LP']
+#            else:
+#                shift_finger = FINGERS['RP']
+#
+#            instructions = _('Press and hold the SHIFT key with your %(finger)s finger, ') % { 'finger': shift_finger }
+#            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
+#
+#        elif state == gtk.gdk.MOD5_MASK:
+#            instructions = _('Press and hold the ALTGR key, ') 
+#            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
+#
+#        elif state == gtk.gdk.SHIFT_MASK | gtk.gdk.MOD5_MASK:
+#            instructions = _('Press and hold the ALTGR and SHIFT keys, ')
+#            instructions += _('then press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
+#
+#        else:
+#            instructions = _('Press the %(letter)s key with your %(finger)s finger.') % { 'letter': letter, 'finger': finger }
+#
+#        steps.append(make_step(instructions, 'key', letter))
 
-        steps.append(make_step(instructions, 'key', letter))
+    steps.append(make_step(_("Let\'s learn the new keys."), 'key', ''.join(new_keys) * 4))
 
     steps.append(make_step(
         get_congrats() + _('Practice typing the keys you just learned.'),