add gettext in some places

5 files changed, 29 insertions, 37 deletions

diff --git a/src/game/Area1Game4.py b/src/game/Area1Game4.py
index 6643747..96a6be7 100644
--- a/src/game/Area1Game4.py
+++ b/src/game/Area1Game4.py
@@ -94,7 +94,7 @@ class CArea1Game4(CGameState):
         self.mLabelQuestion.set_text(self.mQuestions[self.mQuestionsL[self.mCurrentQuestion]][0])
         CGame().addChild(self.mLabelQuestion)
         
-        t = unicode('Última pregunta', 'UTF-8')
+        t = unicode(_('Última pregunta'), 'UTF-8')
         self.mLabelEnd = Globe((400, 100), pico='None', text=t)
         self.mLabelEnd.set_center((600, 400))
         
@@ -142,7 +142,7 @@ class CArea1Game4(CGameState):
                 CGame().removeChild(self.mBadSprite)
                 self.mLocalState = STATE_ANSWER
                 self.mCurrentQuestion = self.mCurrentQuestion + 1
-                print 'estado de preguntas', self.mCurrentQuestion
+                #print 'estado de preguntas', self.mCurrentQuestion
                 if not(self.mCurrentQuestion == 6):
                     self.mLabelQuestion.set_text(self.mQuestions[self.mQuestionsL[self.mCurrentQuestion]][0])
                 else:
diff --git a/src/game/HallState.py b/src/game/HallState.py
index c0a2bed..d1c14ba 100644
--- a/src/game/HallState.py
+++ b/src/game/HallState.py
@@ -13,6 +13,8 @@ import api.Math as CMath
 from BoyHall import CBoyHall
 from Area1Game1 import CArea1Game1
 
+from gettext import gettext as _
+
 class CHallState(CGameState):
 
     mBackground = None
@@ -22,11 +24,7 @@ class CHallState(CGameState):
     mButtonBack = None
     
     mCurrentSelectedArea = 0
-    
-    mArea1 = None
-    
-    #mFrameDoor0101 = []
-    
+
     AREA1_POLYGON = [(424,90), (764,90), (764, 700), (424,700)]
         
     mPlayer = None    
@@ -49,7 +47,7 @@ class CHallState(CGameState):
         self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonBack.set_center((100, 100))
         self.mButtonBack.set_size((200, 40))  
-        self.mButtonBack.set_text("Volver")
+        self.mButtonBack.set_text(_("Volver"))
         CGame().addChild(self.mButtonBack)
         
         self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-1.png', False))
@@ -60,21 +58,13 @@ class CHallState(CGameState):
         self.mBackgroundList.append(CImage.loadImage('assets/images/hall/A1-Pasillo-6.png', False))
         
         CGame().setBackground(self.mBackgroundList[self.mCurrentSelectedArea])
-        
-        
+                
         self.mDoor = CSprite()
         self.mDoor.setXY(400, 50)
         self.mFrameImageDoor = Image.loadImage('assets/images/hall/A1-puerta-resaltada.png')
         self.mDoor.setImage(self.mFrameImageDoor)
         self.mDoorIs = False
         
-        """self.mStar = CSprite()
-        #self.mStar.setXY(400, 50)
-        self.mStar.setXY(730, 40)
-        star = Image.loadImage('assets/images/hall/star1.png')
-        self.mStar.setImage(star)
-        CGame().addChild(self.mStar)"""
-        
         self.mStar1 = Image.loadImage('assets/images/hall/star1.png')
         self.mStar2 = Image.loadImage('assets/images/hall/star2.png')
         
@@ -189,7 +179,7 @@ class CHallState(CGameState):
         CGame().removeChild(self.mPlayer)
         self.mPlayer.destroy()
         self.mPlayer = None
-        #CGame().removeChild(self.mStar)
+
         for e in self.mAreaStates:
             CGame().removeChild(e)
         self.mStar1 = None
diff --git a/src/game/MenuState.py b/src/game/MenuState.py
index b232a1e..c4b4e7c 100644
--- a/src/game/MenuState.py
+++ b/src/game/MenuState.py
@@ -5,7 +5,7 @@ from api.GameState import CGameState
 from api.Game import CGame
 from api.Button import CButton
 from CreditsState import CCreditsState
-from SelectAreaState import CSelectAreaState
+#from SelectAreaState import CSelectAreaState
 import api.Image as Image
 from game.PresentationState import CPresentationState
 from game.SelectPartidaState import CSelectPartidaState
@@ -15,7 +15,7 @@ from game.Area1Game4 import CArea1Game4
 from game.Area1Game6 import CArea1Game6
 from game.Area2Game2 import CArea2Game2
 
-#from gettext import gettext as _
+from gettext import gettext as _
 
 class CMenuState(CGameState):
     
@@ -42,7 +42,7 @@ class CMenuState(CGameState):
         self.mButtonPresentation.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
         self.mButtonPresentation.set_center((200, 100))
         self.mButtonPresentation.set_size((200, 40))
-        self.mButtonPresentation.set_text('Presentacion')
+        self.mButtonPresentation.set_text(_('Presentacion'))
         CGame().addChild(self.mButtonPresentation)
         
         self.mButtonPartida = CButton()
@@ -51,7 +51,7 @@ class CMenuState(CGameState):
         self.mButtonPartida.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 28)
         self.mButtonPartida.set_center((200, 250))
         self.mButtonPartida.set_size((200, 40))
-        self.mButtonPartida.set_text('Partida')
+        self.mButtonPartida.set_text(_('Partida'))
         CGame().addChild(self.mButtonPartida)
         
         self.mButtonCredits = CButton()
@@ -59,7 +59,7 @@ class CMenuState(CGameState):
         self.mButtonCredits.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonCredits.set_center((600, 420))
         self.mButtonCredits.set_size((200, 40))
-        self.mButtonCredits.set_text('Créditos')
+        self.mButtonCredits.set_text(_('Créditos'))
         CGame().addChild(self.mButtonCredits)
         
         """self.mButtonPlay = CButton()
@@ -76,7 +76,7 @@ class CMenuState(CGameState):
         self.mButtonHelp.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
         self.mButtonHelp.set_center((600, 470))
         self.mButtonHelp.set_size((200, 40))
-        self.mButtonHelp.set_text('Ayuda')
+        self.mButtonHelp.set_text(_('Ayuda'))
         CGame().addChild(self.mButtonHelp)
         
         self.mButtonExit = CButton()
@@ -84,7 +84,7 @@ class CMenuState(CGameState):
         self.mButtonExit.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 32)
         self.mButtonExit.set_center((600, 520))
         self.mButtonExit.set_size((200, 40))
-        self.mButtonExit.set_text('Salir')
+        self.mButtonExit.set_text(_('Salir'))
         CGame().addChild(self.mButtonExit)
 
         self.mButtonA1G1 = CButton()
diff --git a/src/game/SelectAreaState.py b/src/game/SelectAreaState.py
index e711bb5..9ae68dc 100644
--- a/src/game/SelectAreaState.py
+++ b/src/game/SelectAreaState.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+
+import pygame
 import MenuState
 from api.GameState import CGameState
 from api.MultiLabel import CMultiLabel
@@ -13,7 +15,8 @@ from HallState import CHallState
 
 from assets.data import selectArea_data
 
-import pygame
+from gettext import gettext as _
+
 
 class CSelectAreaState(CGameState):
 
@@ -47,7 +50,7 @@ class CSelectAreaState(CGameState):
         self.mButtonBack.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mButtonBack.set_center((100, 100))
         self.mButtonBack.set_size((200, 40))  
-        self.mButtonBack.set_text("Volver")
+        self.mButtonBack.set_text(_("Volver"))
         CGame().addChild(self.mButtonBack)
         
         self.mBackground = Image.loadImage('assets/images/selectArea/background.png', False)
diff --git a/src/game/SelectPartidaState.py b/src/game/SelectPartidaState.py
index dc36939..62c52c3 100644
--- a/src/game/SelectPartidaState.py
+++ b/src/game/SelectPartidaState.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import pygame
 from api.GameState import CGameState
 from api.Label import CLabel
 from api.Game import CGame
@@ -72,7 +71,7 @@ class CSelectPartidaState(CGameState):
         self.mMessage.set_text(unicode(mes, 'UTF-8'))
         CGame().addChild(self.mMessage)
         
-        mes = _('Partida %s')
+        mes = unicode(_('Partida %s'), 'UTF-8')
         self.mLabel1 = CLabel()
         #self.mLabel1.bgColor = (255, 125, 50)
         self.mLabel1.bgColor = (218, 224, 152)
@@ -80,7 +79,7 @@ class CSelectPartidaState(CGameState):
         self.mLabel1.set_font('DejaVuSans.ttf', 28)
         self.mLabel1.set_center((250, 300))
         self.mLabel1.set_size((150, 40))
-        self.mLabel1.set_text(unicode(mes % 1, 'UTF-8'))
+        self.mLabel1.set_text(mes % 1)
         #CGame().addChild(self.mLabel1)
         
         self.mLabel2 = CLabel()
@@ -89,7 +88,7 @@ class CSelectPartidaState(CGameState):
         self.mLabel2.set_font('DejaVuSans.ttf', 28)
         self.mLabel2.set_center((600, 300))
         self.mLabel2.set_size((150, 40))
-        self.mLabel2.set_text(unicode(mes % 2, 'UTF-8'))
+        self.mLabel2.set_text(mes % 2)
         #CGame().addChild(self.mLabel2)
         
         self.mLabel3 = CLabel()
@@ -98,7 +97,7 @@ class CSelectPartidaState(CGameState):
         self.mLabel3.set_font('DejaVuSans.ttf', 28)
         self.mLabel3.set_center((950, 300))
         self.mLabel3.set_size((150, 40))
-        self.mLabel3.set_text(unicode(mes % 3, 'UTF-8'))
+        self.mLabel3.set_text(mes % 3)
         #CGame().addChild(self.mLabel3)
         
         juan = Image.loadImage('assets/images/selectPartida/T-juan.png')
@@ -106,13 +105,14 @@ class CSelectPartidaState(CGameState):
         star1 = Image.loadImage('assets/images/hall/star1.png')
         star2 = Image.loadImage('assets/images/hall/star2.png')
         
+        mes = unicode(_('Partida vacía'), 'UTF-8')
         self.mEmpty1 = CLabel()
         self.mEmpty1.bgColor = (218, 224, 152)
         self.mEmpty1.fgColor = (0xFF, 0xFF, 0xFF)
         self.mEmpty1.set_font('DejaVuSans.ttf', 28)
         self.mEmpty1.set_center((250, 450))
         self.mEmpty1.set_size((200, 40))
-        self.mEmpty1.set_text(unicode('Partida vacía', 'UTF-8'))
+        self.mEmpty1.set_text(mes)
         #CGame().addChild(self.mEmpty1)
         
         self.mEmpty2 = CLabel()
@@ -121,7 +121,7 @@ class CSelectPartidaState(CGameState):
         self.mEmpty2.set_font('DejaVuSans.ttf', 28)
         self.mEmpty2.set_center((600, 450))
         self.mEmpty2.set_size((200, 40))
-        self.mEmpty2.set_text(unicode('Partida vacía', 'UTF-8'))
+        self.mEmpty2.set_text(mes)
         #CGame().addChild(self.mEmpty2)
         
         self.mEmpty3 = CLabel()
@@ -130,7 +130,7 @@ class CSelectPartidaState(CGameState):
         self.mEmpty3.set_font('DejaVuSans.ttf', 28)
         self.mEmpty3.set_center((950, 450))
         self.mEmpty3.set_size((200, 40))
-        self.mEmpty3.set_text(unicode('Partida vacía', 'UTF-8'))
+        self.mEmpty3.set_text(mes)
         #CGame().addChild(self.mEmpty3)
         
         self.mChar1 = CSprite()
@@ -387,7 +387,6 @@ class CSelectPartidaState(CGameState):
     
         for e in self.mAllStars:
             CGame().removeChild(e)
-        
-        
+                
         self.mBackground = None
         print "CMenuState destroy"