remove debug print; add import to Config; gettextify tables

pyfpdb/Anonymise.py

@@ -25,7 +25,6 @@ import sys
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/BetfairToFpdb.py

@@ -24,7 +24,6 @@ from HandHistoryConverter import *
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/Card.py

@@ -17,7 +17,6 @@
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/Configuration.py

@@ -36,6 +36,18 @@ import re
 import xml.dom.minidom
 from xml.dom.minidom import Node
 
+import locale
+lang=locale.getdefaultlocale()[0][0:2]
+if lang=="en":
+    def _(string): return string
+else:
+    import gettext
+    try:
+        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
+        trans.install()
+    except IOError:
+        def _(string): return string
+
 import logging, logging.config
 import ConfigParser
 

pyfpdb/GuiBulkImport.py

@@ -35,7 +35,6 @@ import Exceptions
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/GuiDatabase.py

@@ -37,7 +37,6 @@ import SQL
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/GuiLogView.py

@@ -32,7 +32,6 @@ log = logging.getLogger("logview")
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/HandHistoryConverter.py

@@ -43,7 +43,6 @@ import Configuration
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/ImapFetcher.py

@@ -24,7 +24,6 @@ import PokerStarsSummary
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/Options.py

@@ -21,7 +21,6 @@ from optparse import OptionParser
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/Tables.py

@@ -29,8 +29,19 @@ import os
 import sys
 import re
 
-#    Win32 modules
+import locale
+lang=locale.getdefaultlocale()[0][0:2]
+if lang=="en":
+    def _(string): return string
+else:
+    import gettext
+    try:
+        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
+        trans.install()
+    except IOError:
+        def _(string): return string
 
+#    Win32 modules
 if os.name == 'nt':
     import win32gui
     import win32process
@@ -220,7 +231,7 @@ def discover_nt(c):
                 tw.site = "Full Tilt"
             else:
                 tw.site = "Unknown"
-                sys.stderr.write("Found unknown table = %s" % tw.title)
+                sys.stderr.write(_("Found unknown table = %s") % tw.title)
             if tw.site != "Unknown":
                 eval("%s(tw)" % c.supported_sites[tw.site].decoder)
             else:
@@ -247,7 +258,7 @@ def discover_nt_by_name(c, tablename):
         if 'Chat:' in titles[hwnd]: continue # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows
         if ' - Table ' in titles[hwnd]: continue # Absolute table Chat window.. sigh. TODO: Can we tell what site we're trying to discover for somehow in here, so i can limit this check just to AP searches?
         temp = decode_windows(c, titles[hwnd], hwnd)
-        print "attach to window", temp
+        print _("attach to window"), temp
         return temp
     return None
 
@@ -434,5 +445,5 @@ if __name__=="__main__":
     for t in tables.keys():
         print tables[t]
 
-    print "press enter to continue"
+    print _("press enter to continue")
     sys.stdin.readline()

pyfpdb/Tables_Demo.py

@@ -38,7 +38,6 @@ from HandHistoryConverter import getTableTitleRe
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/TourneyFilters.py

@@ -45,9 +45,9 @@ class TourneyFilters(Filters.Filters):
         self.conf = db.config
         self.display = display
         
-        self.filterText = {'playerstitle':'Hero:', 'sitestitle':'Sites:', 'seatstitle':'Number of Players:',
+        self.filterText = {'playerstitle':_('Hero:'), 'sitestitle':_('Sites:'), 'seatstitle':_('Number of Players:'),
-                    'seatsbetween':'Between:', 'seatsand':'And:', 'datestitle':'Date:',
+                    'seatsbetween':_('Between:'), 'seatsand':_('And:'), 'datestitle':_('Date:'),
-                    'tourneyTypesTitle':'Tourney Type'}
+                    'tourneyTypesTitle':_('Tourney Type')}
         
         gen = self.conf.get_general_params()
         self.day_start = 0
@@ -102,7 +102,7 @@ class TourneyFilters(Filters.Filters):
             if len(result) == 1:
                 self.siteid[site] = result[0][0]
             else:
-                print "Either 0 or more than one site matched (%s) - EEK" % site
+                print _("Either 0 or more than one site matched (%s) - EEK") % site
 
         # For use in date ranges.
         self.start_date = gtk.Entry(max=12)

pyfpdb/fpdb.pyw

@@ -22,7 +22,6 @@ import Queue
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else:

pyfpdb/windows_make_bats.py

@@ -19,7 +19,6 @@
 
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
-print "lang:", lang
 if lang=="en":
     def _(string): return string
 else: