[Adonthell-commits] CVS: wastesedge/scripts/modules Makefile.am,1.10,1.11 character_screen.py,1.4,1.5 intro.py,1.10,1.11 main_menu.py,1.17,1.18

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge/scripts/modules
In directory subversions:/tmp/cvs-serv1954/scripts/modules

Modified Files:
        Makefile.am character_screen.py intro.py main_menu.py 
Log Message:
UPDATE to 0.3.2pre


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/modules/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.am 6 Dec 2001 12:16:34 -0000       1.10
--- Makefile.am 6 May 2002 13:47:18 -0000       1.11
***************
*** 3,7 ****
  pkgdata_DATA = *.pyc
  
! EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py
  
  all:
--- 3,8 ----
  pkgdata_DATA = *.pyc
  
! EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py \
!       player_text.py
  
  all:

Index: character_screen.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/modules/character_screen.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** character_screen.py 27 Dec 2001 00:40:49 -0000      1.4
--- character_screen.py 6 May 2002 13:47:18 -0000       1.5
***************
*** 15,18 ****
--- 15,21 ----
  import adonthell
  
+ # -- pygettext support
+ def _(message): return adonthell.nls_translate (message)
+ 
  # -- GUI for chosing the name of the main character
  class character_screen (adonthell.win_container):
***************
*** 38,42 ****
          self.title.set_font (self.font)
          self.title.set_form (adonthell.label_AUTO_SIZE)
!         self.title.set_text ("Enter your character's name")
          self.title.pack ()
          self.title.move ((self.length () - self.title.length ())/2, 10)
--- 41,45 ----
          self.title.set_font (self.font)
          self.title.set_form (adonthell.label_AUTO_SIZE)
!         self.title.set_text (_("Enter your character's name"))
          self.title.pack ()
          self.title.move ((self.length () - self.title.length ())/2, 10)

Index: intro.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/modules/intro.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** intro.py    26 Jan 2002 11:10:10 -0000      1.10
--- intro.py    6 May 2002 13:47:18 -0000       1.11
***************
*** 17,20 ****
--- 17,23 ----
  from adonthell import *
  
+ # -- pygettext support
+ def _(message): return nls_translate (message)
+ 
  def update_im (im, x):
      if x <= -im.length (): x = x + im.length ()
***************
*** 88,107 ****
  cont.add (lab)
  
! wintext = ("One week out of Cirdanth, the trail had\nbecome hard. I had begun 
to wonder\ndays ago whether \
! it could still be called\na trail, but it was the only way the\ncaravans 
had.",
!            "There were no caravans now, only me,\nand I had seen few others 
on the road.\nEven those had \
! become more scarce\nthe further I went.",
!            "It was easy to see why.",
!            "The Lady Silverhair, intent on her\nmission, had gone on ahead 
while I was\nleft to complete \
! business in her name,\ntrusting me to follow in good speed.",
!            "A lone Half-Elf may travel with much\nmore speed than an Elven 
lady and her\nservants, so she \
  was now only a day\nahead.  The thought nearly caused me\nto forget \
! the harshness of the road.",
!            "Still, Waste's Edge was a welcome sight.",
!            "As you approach the trading post, there\nseems to be little sign 
of life.      \
!            \n       \nEventually you find the Redwyne Inn,\nwhich seems to be 
the main building\nhere.",
!            "The heavy wooden doors are closed,\nand no one is there \
! to let you in. As you\napproach the gate, you suddenly hear a voice from 
within.",
!            "                      \nSuddenly, it looked like the day 
would\nbe harder than I thought ...")
  
  cont.set_visible_background (0);
--- 91,110 ----
  cont.add (lab)
  
! wintext = (_("One week out of Cirdanth, the trail had\nbecome hard. I had 
begun to wonder\ndays ago whether \
! it could still be called\na trail, but it was the only way the\ncaravans 
had."),
!            _("There were no caravans now, only me,\nand I had seen few others 
on the road.\nEven those had \
! become more scarce\nthe further I went."),
!            _("It was easy to see why."),
!            _("The Lady Silverhair, intent on her\nmission, had gone on ahead 
while I was\nleft to complete \
! business in her name,\ntrusting me to follow in good speed."),
!            _("A lone Half-Elf may travel with much\nmore speed than an Elven 
lady and her\nservants, so she \
  was now only a day\nahead.  The thought nearly caused me\nto forget \
! the harshness of the road."),
!            _("Still, Waste's Edge was a welcome sight."),
!            _("As you approach the trading post, there\nseems to be little 
sign of life.      \
!            \n       \nEventually you find the Redwyne Inn,\nwhich seems to be 
the main building\nhere."),
!            _("The heavy wooden doors are closed,\nand no one is there \
! to let you in. As you\napproach the gate, you suddenly hear a voice from 
within."),
!            _("                      \nSuddenly, it looked like the day 
would\nbe harder than I thought ..."))
  
  cont.set_visible_background (0);
***************
*** 119,135 ****
  else: myname = "Banec"
  
! bubtext = (("Halt! Stand and declare yourself, stranger!", "red", 25, 5, 350, 
1),
!            ("I am " + myname + ", come as an agent for my employer. Tell me, 
is this the trading \
! post of Waste's Edge?", "yellow", 130, 5, 500, 2),
!            ("That it is, but this is all you'll see of it.", "red", 25, 5, 
300, 1),
!            ("If you turn now and make haste, you should be able to make safe 
camping \
! before dark.", "red", 25, 5, 400, 1),
!            ("Turn back?  Whatever for?  And why is the gate of a free Inn 
locked \
! against a footsore traveller?", "yellow", 140, 20, 500, 0),
!            ("I am sorry, traveller, but the Inn is barred and you must be 
off.", "red", 25, 5, 300, 0),
!            ("There has been trouble inside and I have instructions to turn 
away all who \
! need not be here.", "red", 25, 5, 400, 0),
!            ("Trouble?  Why then, I must get inside.  My employer will need me 
close at \
! hand!", "yellow", 140, 30, 500, 0))
  
  # The audio
--- 122,138 ----
  else: myname = "Banec"
  
! bubtext = ((_("Halt! Stand and declare yourself, stranger!"), "red", 25, 5, 
350, 1),
!            (_("I am ") + myname + _(", come as an agent for my employer. Tell 
me, is this the trading \
! post of Waste's Edge?"), "yellow", 130, 5, 500, 2),
!            (_("That it is, but this is all you'll see of it."), "red", 25, 5, 
300, 1),
!            (_("If you turn now and make haste, you should be able to make 
safe camping \
! before dark."), "red", 25, 5, 400, 1),
!            (_("Turn back?  Whatever for?  And why is the gate of a free Inn 
locked \
! against a footsore traveller?"), "yellow", 140, 20, 500, 0),
!            (_("I am sorry, traveller, but the Inn is barred and you must be 
off."), "red", 25, 5, 300, 0),
!            (_("There has been trouble inside and I have instructions to turn 
away all who \
! need not be here."), "red", 25, 5, 400, 0),
!            (_("Trouble?  Why then, I must get inside.  My employer will need 
me close at \
! hand!"), "yellow", 140, 30, 500, 0))
  
  # The audio

Index: main_menu.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/modules/main_menu.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** main_menu.py        19 Dec 2001 17:07:35 -0000      1.17
--- main_menu.py        6 May 2002 13:47:18 -0000       1.18
***************
*** 15,18 ****
--- 15,21 ----
  from adonthell import *
  
+ # -- pygettext support
+ def _(message): return nls_translate (message)
+ 
  # The Game Menu
  class main_menu (win_container):
***************
*** 61,66 ****
          self.new_game.set_font(self.font)
                self.new_game.set_form (label_AUTO_SIZE)
!         if enable_s == 0: self.new_game.set_text ("New Game")
!         else: self.new_game.set_text ("Continue")
          self.new_game.move (-self.new_game.length (), y_pos)
          self.new_game.pack()
--- 64,69 ----
          self.new_game.set_font(self.font)
                self.new_game.set_form (label_AUTO_SIZE)
!         if enable_s == 0: self.new_game.set_text (_("New Game"))
!         else: self.new_game.set_text (_("Continue"))
          self.new_game.move (-self.new_game.length (), y_pos)
          self.new_game.pack()
***************
*** 71,75 ****
          self.load_game.set_font(self.font)
          self.load_game.set_form (label_AUTO_SIZE)
!         self.load_game.set_text ("Load Game")
          self.load_game.move (self.length (), y_pos)
          self.load_game.pack()
--- 74,78 ----
          self.load_game.set_font(self.font)
          self.load_game.set_form (label_AUTO_SIZE)
!         self.load_game.set_text (_("Load Game"))
          self.load_game.move (self.length (), y_pos)
          self.load_game.pack()
***************
*** 80,84 ****
          self.save_game.set_font(self.font)
          self.save_game.set_form (label_AUTO_SIZE)
!         self.save_game.set_text ("Save Game")
          self.save_game.move (-self.save_game.length (), y_pos)  
                self.save_game.pack()
--- 83,87 ----
          self.save_game.set_font(self.font)
          self.save_game.set_form (label_AUTO_SIZE)
!         self.save_game.set_text (_("Save Game"))
          self.save_game.move (-self.save_game.length (), y_pos)  
                self.save_game.pack()
***************
*** 89,93 ****
          self.options.set_font (self.font)
          self.options.set_form (label_AUTO_SIZE)
!         self.options.set_text ("Options")
          self.options.move (-self.options.length (), y_pos)
          self.options.pack()
--- 92,96 ----
          self.options.set_font (self.font)
          self.options.set_form (label_AUTO_SIZE)
!         self.options.set_text (_("Options"))
          self.options.move (-self.options.length (), y_pos)
          self.options.pack()
***************
*** 100,104 ****
          self.labquit.set_font(self.font)
          self.labquit.set_form (label_AUTO_SIZE)
!         self.labquit.set_text ("Quit")
          self.labquit.move (self.length (), y_pos)
          self.labquit.pack()
--- 103,107 ----
          self.labquit.set_font(self.font)
          self.labquit.set_form (label_AUTO_SIZE)
!         self.labquit.set_text (_("Quit"))
          self.labquit.move (self.length (), y_pos)
          self.labquit.pack()