From 5ede2990f222d762cf047dccaee2ec988984ab8e Mon Sep 17 00:00:00 2001 From: Live System User Date: Thu, 26 Feb 2009 00:26:48 +0000 Subject: Fix translation of strings in global variables in lessonbuilder.py. --- diff --git a/MANIFEST b/MANIFEST index 5b9fb29..b01ee1b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -77,7 +77,6 @@ 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/out.log lessons/ne_NP/rightcapital.lesson lessons/ne_NP/bottomrow.lesson lessons/ne_NP/leftcapital.lesson diff --git a/lessonbuilder.py b/lessonbuilder.py index dae1213..62e8e79 100755 --- a/lessonbuilder.py +++ b/lessonbuilder.py @@ -34,40 +34,6 @@ def error(s): print "The lesson could not be generated, exiting.\n\n" sys.exit(1) -CONGRATS = [ - _('Well done!'), - _('Good job.'), - _('Awesome!'), - _('Way to go!'), - _('Wonderful!'), - _('Nice work.'), - _('You did it!'), -] - -def get_congrats(): - return random.choice(CONGRATS) + ' ' - -HINTS = [ - _('Be careful to use the correct finger to press each key. Look at the keyboard below if you need help remembering.'), - _('Try to type at the same speed, all the time. As you get more comfortable you can increase the speed a little.') -] - -def get_hint(): - return random.choice(HINTS) - -FINGERS = { - 'LP': _('left little'), - 'LR': _('left ring'), - 'LM': _('left middle'), - 'LI': _('left index'), - 'LT': _('left thumb'), - 'RP': _('right little'), - 'RR': _('right ring'), - 'RM': _('right middle'), - 'RI': _('right index'), - 'RT': _('right thumb'), -} - def make_all_triples(keys): text = '' for k in new_keys: @@ -288,6 +254,40 @@ def build_key_steps( count, new_keys, base_keys, words, bad_words): + CONGRATS = [ + _('Well done!'), + _('Good job.'), + _('Awesome!'), + _('Way to go!'), + _('Wonderful!'), + _('Nice work.'), + _('You did it!'), + ] + + def get_congrats(): + return random.choice(CONGRATS) + ' ' + + HINTS = [ + _('Be careful to use the correct finger to press each key. Look at the keyboard below if you need help remembering.'), + _('Try to type at the same speed, all the time. As you get more comfortable you can increase the speed a little.') + ] + + def get_hint(): + return random.choice(HINTS) + + FINGERS = { + 'LP': _('left little'), + 'LR': _('left ring'), + 'LM': _('left middle'), + 'LI': _('left index'), + 'LT': _('left thumb'), + 'RP': _('right little'), + 'RR': _('right ring'), + 'RM': _('right middle'), + 'RI': _('right index'), + 'RT': _('right thumb'), + } + all_keys = new_keys + base_keys good_words = filter_wordlist(words=words, diff --git a/po/TypingTurtle.pot b/po/TypingTurtle.pot index 94b929d..9f241e5 100644 --- a/po/TypingTurtle.pot +++ b/po/TypingTurtle.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-20 07:41+0000\n" +"POT-Creation-Date: 2009-02-26 00:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,151 +16,135 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: activity/activity.info:2 typingturtle.py:56 mainscreen.py:49 +#: activity/activity.info:2 mainscreen.py:49 typingturtle.py:56 msgid "Typing Turtle" msgstr "" -#: lessonscreen.py:59 balloongame.py:53 -msgid "Go Back" +#: medalscreen.py:53 +msgid "" +"Certificate of Achievement" msgstr "" -#: lessonscreen.py:177 -#, python-format -msgid "WPM: %(wpm)d" +#: medalscreen.py:56 +msgid "This certifies that" msgstr "" -#: lessonscreen.py:185 medalscreen.py:89 +#: medalscreen.py:59 #, python-format -msgid "Accuracy: %(accuracy)d%%" -msgstr "" - -#: lessonscreen.py:536 -msgid "Good job!" -msgstr "" - -#: lessonscreen.py:537 lessonbuilder.py:38 -msgid "Well done!" -msgstr "" - -#: lessonscreen.py:538 -msgid "Nice work!" -msgstr "" - -#: lessonscreen.py:539 lessonbuilder.py:41 -msgid "Way to go!" +msgid "%(nick)s" msgstr "" -#: lessonscreen.py:544 +#: medalscreen.py:62 #, python-format -msgid "You finished the lesson in %(time)d seconds, with %(errors)d errors.\n" +msgid "earned a %(type)s medal in " msgstr "" -#: lessonscreen.py:546 +#: medalscreen.py:65 #, python-format -msgid "" -"Your words per minute (WPM) was %(wpm)d, and your accuracy was %(accuracy)d%" -"%.\n" -"\n" +msgid "in %(lesson)s" msgstr "" -#: lessonscreen.py:549 +#: medalscreen.py:68 #, python-format -msgid "You finished the lesson with %(errors)d errors.\n" +msgid "on %(date)s." msgstr "" -#: lessonscreen.py:551 +#: medalscreen.py:85 #, python-format -msgid "" -"Your accuracy was %(accuracy)d%%.\n" -"\n" +msgid "Words Per Minute: %(wpm)d" msgstr "" -#: lessonscreen.py:557 +#: medalscreen.py:89 lessonscreen.py:185 #, python-format -msgid "Congratulations! You earned a %(type)s medal!" +msgid "Accuracy: %(accuracy)d%%" msgstr "" -#: lessonscreen.py:565 -msgid "You need to practice this lesson more before moving on." +#: medalscreen.py:94 +#, python-format +msgid "SCORE: %(score)d" msgstr "" -#: lessonscreen.py:568 -msgid "You almost got a medal! Next time, try not to make as many errors." +#: medalscreen.py:98 balloongame.py:223 +msgid "Press the ENTER key to continue." msgstr "" -#: lessonscreen.py:571 -msgid "You almost got a medal! Next time, try to type a little faster." +#: lessonbuilder.py:258 lessonscreen.py:537 +msgid "Well done!" msgstr "" -#: lessonbuilder.py:39 +#: lessonbuilder.py:259 msgid "Good job." msgstr "" -#: lessonbuilder.py:40 +#: lessonbuilder.py:260 msgid "Awesome!" msgstr "" -#: lessonbuilder.py:42 +#: lessonbuilder.py:261 lessonscreen.py:539 +msgid "Way to go!" +msgstr "" + +#: lessonbuilder.py:262 msgid "Wonderful!" msgstr "" -#: lessonbuilder.py:43 +#: lessonbuilder.py:263 msgid "Nice work." msgstr "" -#: lessonbuilder.py:44 +#: lessonbuilder.py:264 msgid "You did it!" msgstr "" -#: lessonbuilder.py:51 +#: lessonbuilder.py:271 msgid "" "Be careful to use the correct finger to press each key. Look at the " "keyboard below if you need help remembering." msgstr "" -#: lessonbuilder.py:52 +#: lessonbuilder.py:272 msgid "" "Try to type at the same speed, all the time. As you get more comfortable " "you can increase the speed a little." msgstr "" -#: lessonbuilder.py:59 +#: lessonbuilder.py:279 msgid "left little" msgstr "" -#: lessonbuilder.py:60 +#: lessonbuilder.py:280 msgid "left ring" msgstr "" -#: lessonbuilder.py:61 +#: lessonbuilder.py:281 msgid "left middle" msgstr "" -#: lessonbuilder.py:62 +#: lessonbuilder.py:282 msgid "left index" msgstr "" -#: lessonbuilder.py:63 +#: lessonbuilder.py:283 msgid "left thumb" msgstr "" -#: lessonbuilder.py:64 +#: lessonbuilder.py:284 msgid "right little" msgstr "" -#: lessonbuilder.py:65 +#: lessonbuilder.py:285 msgid "right ring" msgstr "" -#: lessonbuilder.py:66 +#: lessonbuilder.py:286 msgid "right middle" msgstr "" -#: lessonbuilder.py:67 +#: lessonbuilder.py:287 msgid "right index" msgstr "" -#: lessonbuilder.py:68 +#: lessonbuilder.py:288 msgid "right thumb" msgstr "" @@ -276,49 +260,6 @@ msgstr "" msgid "Copy out the following text." msgstr "" -#: medalscreen.py:53 -msgid "" -"Certificate of Achievement" -msgstr "" - -#: medalscreen.py:56 -msgid "This certifies that" -msgstr "" - -#: medalscreen.py:59 -#, python-format -msgid "%(nick)s" -msgstr "" - -#: medalscreen.py:62 -#, python-format -msgid "earned a %(type)s medal in " -msgstr "" - -#: medalscreen.py:65 -#, python-format -msgid "in %(lesson)s" -msgstr "" - -#: medalscreen.py:68 -#, python-format -msgid "on %(date)s." -msgstr "" - -#: medalscreen.py:85 -#, python-format -msgid "Words Per Minute: %(wpm)d" -msgstr "" - -#: medalscreen.py:94 -#, python-format -msgid "SCORE: %(score)d" -msgstr "" - -#: medalscreen.py:98 balloongame.py:223 -msgid "Press the ENTER key to continue." -msgstr "" - #: mainscreen.py:108 msgid "Next" msgstr "" @@ -353,6 +294,10 @@ msgstr "" msgid "Gold Medal" msgstr "" +#: balloongame.py:53 lessonscreen.py:59 +msgid "Go Back" +msgstr "" + #: balloongame.py:210 msgid "You finished!" msgstr "" @@ -375,3 +320,58 @@ msgstr "" #: balloongame.py:340 msgid "Type the words to pop the balloons!" msgstr "" + +#: lessonscreen.py:177 +#, python-format +msgid "WPM: %(wpm)d" +msgstr "" + +#: lessonscreen.py:536 +msgid "Good job!" +msgstr "" + +#: lessonscreen.py:538 +msgid "Nice work!" +msgstr "" + +#: lessonscreen.py:544 +#, python-format +msgid "You finished the lesson in %(time)d seconds, with %(errors)d errors.\n" +msgstr "" + +#: lessonscreen.py:546 +#, python-format +msgid "" +"Your words per minute (WPM) was %(wpm)d, and your accuracy was %(accuracy)d%" +"%.\n" +"\n" +msgstr "" + +#: lessonscreen.py:549 +#, python-format +msgid "You finished the lesson with %(errors)d errors.\n" +msgstr "" + +#: lessonscreen.py:551 +#, python-format +msgid "" +"Your accuracy was %(accuracy)d%%.\n" +"\n" +msgstr "" + +#: lessonscreen.py:557 +#, python-format +msgid "Congratulations! You earned a %(type)s medal!" +msgstr "" + +#: lessonscreen.py:565 +msgid "You need to practice this lesson more before moving on." +msgstr "" + +#: lessonscreen.py:568 +msgid "You almost got a medal! Next time, try not to make as many errors." +msgstr "" + +#: lessonscreen.py:571 +msgid "You almost got a medal! Next time, try to type a little faster." +msgstr "" -- cgit v0.9.1