From 5dc2edda91b1fc54b86bee91db62792106772634 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sun, 25 Nov 2012 19:43:46 +0200 Subject: [PATCH] Get rid of gettext in init. --- pysollib/actions.py | 1 + pysollib/app.py | 1 + pysollib/games/auldlangsyne.py | 1 + pysollib/games/braid.py | 1 + pysollib/games/calculation.py | 1 + pysollib/games/camelot.py | 1 + pysollib/games/canfield.py | 1 + pysollib/games/curdsandwhey.py | 1 + pysollib/games/fan.py | 1 + pysollib/games/golf.py | 1 + pysollib/games/klondike.py | 1 + pysollib/games/larasgame.py | 1 + pysollib/games/mahjongg/mahjongg.py | 1 + pysollib/games/mahjongg/shisensho.py | 1 + pysollib/games/matriarchy.py | 1 + pysollib/games/napoleon.py | 1 + pysollib/games/numerica.py | 1 + pysollib/games/osmosis.py | 1 + pysollib/games/pileon.py | 1 + pysollib/games/royalcotillion.py | 1 + pysollib/games/special/memory.py | 1 + pysollib/games/special/poker.py | 1 + pysollib/games/special/tarock.py | 1 + pysollib/games/spider.py | 1 + pysollib/games/takeaway.py | 1 + pysollib/games/terrace.py | 1 + pysollib/games/threepeaks.py | 1 + pysollib/games/tournament.py | 1 + pysollib/games/ultra/dashavatara.py | 2 ++ pysollib/games/ultra/hanafuda.py | 1 + pysollib/games/ultra/hanafuda1.py | 1 + pysollib/games/ultra/hanafuda_common.py | 1 + pysollib/games/ultra/hexadeck.py | 1 + pysollib/games/ultra/mughal.py | 1 + pysollib/games/yukon.py | 1 + pysollib/help.py | 1 + pysollib/init.py | 38 ++---------------------- pysollib/main.py | 1 + pysollib/options.py | 1 + pysollib/pysolgtk/colorsdialog.py | 1 + pysollib/pysolgtk/fontsdialog.py | 1 + pysollib/pysolgtk/menubar.py | 1 + pysollib/pysolgtk/playeroptionsdialog.py | 1 + pysollib/pysolgtk/selectcardset.py | 1 + pysollib/pysolgtk/selectgame.py | 1 + pysollib/pysolgtk/selecttile.py | 1 + pysollib/pysolgtk/soundoptionsdialog.py | 1 + pysollib/pysolgtk/statusbar.py | 1 + pysollib/pysolgtk/timeoutsdialog.py | 1 + pysollib/pysolgtk/tkhtml.py | 1 + pysollib/pysolgtk/tkstats.py | 1 + pysollib/pysolgtk/tkwidget.py | 1 + pysollib/pysolrandom.py | 1 + pysollib/stats.py | 1 + pysollib/tile/colorsdialog.py | 1 + pysollib/tile/edittextdialog.py | 1 + pysollib/tile/findcarddialog.py | 1 + pysollib/tile/fontsdialog.py | 1 + pysollib/tile/gameinfodialog.py | 1 + pysollib/tile/menubar.py | 1 + pysollib/tile/playeroptionsdialog.py | 1 + pysollib/tile/selectcardset.py | 1 + pysollib/tile/selectgame.py | 1 + pysollib/tile/selecttile.py | 1 + pysollib/tile/solverdialog.py | 1 + pysollib/tile/soundoptionsdialog.py | 1 + pysollib/tile/statusbar.py | 1 + pysollib/tile/timeoutsdialog.py | 1 + pysollib/tile/tkhtml.py | 1 + pysollib/tile/tkstats.py | 1 + pysollib/tile/tkwidget.py | 1 + pysollib/tile/toolbar.py | 1 + pysollib/tile/ttk.py | 1 + pysollib/tile/wizarddialog.py | 1 + pysollib/tk/colorsdialog.py | 1 + pysollib/tk/edittextdialog.py | 1 + pysollib/tk/findcarddialog.py | 1 + pysollib/tk/fontsdialog.py | 1 + pysollib/tk/gameinfodialog.py | 1 + pysollib/tk/menubar.py | 1 + pysollib/tk/playeroptionsdialog.py | 1 + pysollib/tk/selectcardset.py | 1 + pysollib/tk/selectgame.py | 1 + pysollib/tk/selecttile.py | 1 + pysollib/tk/solverdialog.py | 1 + pysollib/tk/soundoptionsdialog.py | 1 + pysollib/tk/statusbar.py | 1 + pysollib/tk/timeoutsdialog.py | 1 + pysollib/tk/tkhtml.py | 1 + pysollib/tk/tkstats.py | 1 + pysollib/tk/tkwidget.py | 1 + pysollib/tk/toolbar.py | 1 + pysollib/tk/wizarddialog.py | 1 + pysollib/winsystems/common.py | 1 + 94 files changed, 96 insertions(+), 36 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 65b77023..0f0421e8 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -44,6 +44,7 @@ from pysollib.pysoltk import ProgressionDialog from pysollib.pysoltk import GameInfoDialog # toolkit imports +from pysollib.mygettext import _, n_ from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry from pysollib.pysoltk import MfxExceptionDialog from pysollib.pysoltk import PlayerOptionsDialog diff --git a/pysollib/app.py b/pysollib/app.py index 8843f5ef..aed68817 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -47,6 +47,7 @@ from pysollib.settings import DEBUG from pysollib.winsystems import TkSettings # Toolkit imports +from pysollib.mygettext import _, n_ from pysollib.pysoltk import wm_withdraw, loadImage from pysollib.pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog from pysollib.pysoltk import TclError, MfxScrolledCanvas diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 208d8e85..fca8653f 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -26,6 +26,7 @@ __all__ = [] # imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index dad0d7c1..35bad1db 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -27,6 +27,7 @@ __all__ = [] import sys, math # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index a39c3b41..c9f7e309 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index 851aab70..cd3906ce 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -26,6 +26,7 @@ __all__ = [] # imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 05352ccf..2c23faf9 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index ddf828d0..20173022 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 680138c7..3a0110ea 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 5952f591..e793ab22 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -27,6 +27,7 @@ __all__ = [] import sys, types # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index bd0ce7b9..9b54cde6 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault, Struct diff --git a/pysollib/games/larasgame.py b/pysollib/games/larasgame.py index 274dc215..34b0e134 100644 --- a/pysollib/games/larasgame.py +++ b/pysollib/games/larasgame.py @@ -26,6 +26,7 @@ __all__ = [] # imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index d1b36930..1a2ff010 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -30,6 +30,7 @@ import time from gettext import ungettext # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault, Struct, Image diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py index 71804a32..85bad369 100644 --- a/pysollib/games/mahjongg/shisensho.py +++ b/pysollib/games/mahjongg/shisensho.py @@ -29,6 +29,7 @@ import sys from gettext import ungettext # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/matriarchy.py b/pysollib/games/matriarchy.py index 72d0baa3..91fb132c 100644 --- a/pysollib/games/matriarchy.py +++ b/pysollib/games/matriarchy.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py index d2f9e071..541e693d 100644 --- a/pysollib/games/napoleon.py +++ b/pysollib/games/napoleon.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index c0818d98..1a495fd1 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -27,6 +27,7 @@ __all__ = [] import sys, time # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py index 79b5972a..6ea7284f 100644 --- a/pysollib/games/osmosis.py +++ b/pysollib/games/osmosis.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 7d030e2c..1cd28691 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 8f68c72e..d2d6f403 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index b229392d..526b8239 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/special/poker.py b/pysollib/games/special/poker.py index 08e11fed..8d248228 100644 --- a/pysollib/games/special/poker.py +++ b/pysollib/games/special/poker.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.stack import * diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index 43edd47e..3fd3b263 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 77e4a4ba..0aaf283e 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -26,6 +26,7 @@ __all__ = [] # imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index ec0e6058..db8e5ccb 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index df4ce383..2f978cb3 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/threepeaks.py b/pysollib/games/threepeaks.py index 020e6bad..bdd9c0b7 100644 --- a/pysollib/games/threepeaks.py +++ b/pysollib/games/threepeaks.py @@ -26,6 +26,7 @@ __all__ = [] # Imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index c474fe18..eada5869 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py index 976aab9f..2ffe54b6 100644 --- a/pysollib/games/ultra/dashavatara.py +++ b/pysollib/games/ultra/dashavatara.py @@ -26,7 +26,9 @@ __all__ = [] # Imports import sys, math, time + # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 1d64d4e9..ade6c4c9 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -27,6 +27,7 @@ __all__ = [] import sys, math # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index 58b945b1..7638ed06 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/ultra/hanafuda_common.py b/pysollib/games/ultra/hanafuda_common.py index b4b95416..a2a6c766 100644 --- a/pysollib/games/ultra/hanafuda_common.py +++ b/pysollib/games/ultra/hanafuda_common.py @@ -52,6 +52,7 @@ __all__ = [ import sys, math +from pysollib.mygettext import _, n_ from pysollib.util import * from pysollib.mfxutil import kwdefault from pysollib.stack import * diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index e635b3c3..1dede9c1 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -27,6 +27,7 @@ __all__ = [] import sys, math # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py index 563f6292..b9c1ac5e 100644 --- a/pysollib/games/ultra/mughal.py +++ b/pysollib/games/ultra/mughal.py @@ -27,6 +27,7 @@ __all__ = [] import sys, math # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index a3d4bc15..c2dff463 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -27,6 +27,7 @@ __all__ = [] import sys # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * from pysollib.mfxutil import kwdefault diff --git a/pysollib/help.py b/pysollib/help.py index 148b4c15..97fd61a3 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -25,6 +25,7 @@ # imports # PySol imports +from pysollib.mygettext import _, n_ from pysollib.settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION from pysollib.pysoltk import make_help_toplevel from pysollib.pysoltk import MfxMessageDialog diff --git a/pysollib/init.py b/pysollib/init.py index 87b2894f..d8a15ff6 100644 --- a/pysollib/init.py +++ b/pysollib/init.py @@ -23,48 +23,17 @@ import sys, os, locale, subprocess import traceback -import gettext +from pysollib.mygettext import _, n_ +import gettext import pysollib.settings # ************************************************************************ # * init # ************************************************************************ -def fix_gettext(): - def ugettext(message): - # unicoded gettext - if not isinstance(message, unicode): - message = unicode(message, 'utf-8') - domain = gettext._current_domain - try: - t = gettext.translation(domain, - gettext._localedirs.get(domain, None)) - except IOError: - return message - return t.ugettext(message) - gettext.ugettext = ugettext - def ungettext(msgid1, msgid2, n): - # unicoded ngettext - if not isinstance(msgid1, unicode): - msgid1 = unicode(msgid1, 'utf-8') - if not isinstance(msgid2, unicode): - msgid2 = unicode(msgid2, 'utf-8') - domain = gettext._current_domain - try: - t = gettext.translation(domain, - gettext._localedirs.get(domain, None)) - except IOError: - if n == 1: - return msgid1 - else: - return msgid2 - return t.ungettext(msgid1, msgid2, n) - gettext.ungettext = ungettext - def init(): - fix_gettext() if os.name == 'nt' and 'LANG' not in os.environ: try: @@ -88,9 +57,6 @@ def init(): #gettext.install('pysol', locale_dir, unicode=True) # ngettext don't work gettext.bindtextdomain('pysol', locale_dir) gettext.textdomain('pysol') - import __builtin__ - __builtin__._ = gettext.ugettext # use unicode - __builtin__.n_ = lambda x: x ## debug if 'PYSOL_CHECK_GAMES' in os.environ or 'PYSOL_DEBUG' in os.environ: diff --git a/pysollib/main.py b/pysollib/main.py index 271ffe07..0e7b9192 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -28,6 +28,7 @@ import traceback import getopt # PySol imports +from pysollib.mygettext import _, n_ from pysollib.util import DataLoader from pysollib.mfxutil import print_err from pysollib.resource import Tile diff --git a/pysollib/options.py b/pysollib/options.py index 4c426114..e1b725c6 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -34,6 +34,7 @@ import pysollib.settings # Toolkit imports from pysollib.pysoltk import TOOLBAR_BUTTONS +from pysollib.mygettext import _, n_ # ************************************************************************ # * Options diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py index d869c3fb..5ef2dea0 100644 --- a/pysollib/pysolgtk/colorsdialog.py +++ b/pysollib/pysolgtk/colorsdialog.py @@ -24,6 +24,7 @@ __all__ = ['ColorsDialog'] # imports +from pysollib.mygettext import _, n_ ## import os, sys import gtk, gobject, pango import gtk.glade diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index 934ff887..e26291d5 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.py @@ -30,6 +30,7 @@ import gtk, gobject, pango import gtk.glade # PySol imports +from pysollib.mygettext import _, n_ from tkutil import create_pango_font_desc diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 0112dcf3..338ef075 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -29,6 +29,7 @@ import gtk from gtk import gdk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.gamedb import GI from pysollib.settings import TITLE diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py index 6012fb72..371f0292 100644 --- a/pysollib/pysolgtk/playeroptionsdialog.py +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -27,6 +27,7 @@ __all__ = ['PlayerOptionsDialog'] import gobject, gtk # PySol imports +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxDialog diff --git a/pysollib/pysolgtk/selectcardset.py b/pysollib/pysolgtk/selectcardset.py index 906e1f52..e511b112 100644 --- a/pysollib/pysolgtk/selectcardset.py +++ b/pysollib/pysolgtk/selectcardset.py @@ -27,6 +27,7 @@ import os, re, sys, types import gtk, gobject # PySol imports +from pysollib.mygettext import _, n_ from pysollib.resource import CSI from pysollib.mfxutil import kwdefault diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index 9c0d9e36..5539d757 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -29,6 +29,7 @@ import gtk, gobject #from UserList import UserList # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import kwdefault from pysollib.mfxutil import format_time diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index ccd51e80..c8281e07 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -30,6 +30,7 @@ from gtk import gdk # PySol imports ## from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.mygettext import _, n_ from pysollib.resource import CSI from pysollib.mfxutil import kwdefault diff --git a/pysollib/pysolgtk/soundoptionsdialog.py b/pysollib/pysolgtk/soundoptionsdialog.py index 7e09b1ff..8437ce77 100644 --- a/pysollib/pysolgtk/soundoptionsdialog.py +++ b/pysollib/pysolgtk/soundoptionsdialog.py @@ -28,6 +28,7 @@ import gtk from gtk import glade # PySol imports +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxDialog diff --git a/pysollib/pysolgtk/statusbar.py b/pysollib/pysolgtk/statusbar.py index c3333ee3..5c4ffa22 100644 --- a/pysollib/pysolgtk/statusbar.py +++ b/pysollib/pysolgtk/statusbar.py @@ -27,6 +27,7 @@ import os, sys import gtk # PySol imports +from pysollib.mygettext import _, n_ # ************************************************************************ diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py index ab7f2e3c..6c7b0989 100644 --- a/pysollib/pysolgtk/timeoutsdialog.py +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -25,6 +25,7 @@ __all__ = ['TimeoutsDialog'] # imports ## import os, sys +from pysollib.mygettext import _, n_ import gtk, gobject, pango import gtk.glade diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py index b93777aa..6b8831e7 100644 --- a/pysollib/pysolgtk/tkhtml.py +++ b/pysollib/pysolgtk/tkhtml.py @@ -27,6 +27,7 @@ __all__ = ['HTMLViewer'] import os, sys, re, types import htmllib, formatter import traceback +from pysollib.mygettext import _, n_ import gtk, pango, gobject from gtk import gdk diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index afb67ff0..86769996 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -28,6 +28,7 @@ import gtk, gobject, pango import gtk.glade # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import format_time from pysollib.settings import TOP_TITLE, TITLE from pysollib.stats import PysolStatsFormatter diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index f474b7e5..a3f5106d 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -29,6 +29,7 @@ import gtk gdk = gtk.gdk # PySol imports +from pysollib.mygettext import _, n_ # Toolkit imports from tkutil import makeToplevel, setTransient, wm_withdraw diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py index 1b38f3a9..be7213e9 100644 --- a/pysollib/pysolrandom.py +++ b/pysollib/pysolrandom.py @@ -25,6 +25,7 @@ # imports import sys, re, time import random +from pysollib.mygettext import _, n_ from pysollib.mfxutil import SubclassResponsibility diff --git a/pysollib/stats.py b/pysollib/stats.py index 3787375d..45e5bd84 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -28,6 +28,7 @@ import time # PySol imports from pysollib.mfxutil import format_time from pysollib.gamedb import GI +from pysollib.mygettext import _, n_ # ************************************************************************ diff --git a/pysollib/tile/colorsdialog.py b/pysollib/tile/colorsdialog.py index 7a185b05..1d406fb2 100644 --- a/pysollib/tile/colorsdialog.py +++ b/pysollib/tile/colorsdialog.py @@ -30,6 +30,7 @@ from tkColorChooser import askcolor # PySol imports from pysollib.mfxutil import KwStruct +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxDialog diff --git a/pysollib/tile/edittextdialog.py b/pysollib/tile/edittextdialog.py index 39183096..9e9e646c 100644 --- a/pysollib/tile/edittextdialog.py +++ b/pysollib/tile/edittextdialog.py @@ -29,6 +29,7 @@ import ttk # PySol imports from pysollib.mfxutil import KwStruct +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxDialog diff --git a/pysollib/tile/findcarddialog.py b/pysollib/tile/findcarddialog.py index 2f57d979..e63877f6 100644 --- a/pysollib/tile/findcarddialog.py +++ b/pysollib/tile/findcarddialog.py @@ -29,6 +29,7 @@ __all__ = ['create_find_card_dialog', # imports import os import Tkinter +from pysollib.mygettext import _, n_ # Toolkit imports from tkutil import after, after_cancel diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index c367abf1..2a297c09 100644 --- a/pysollib/tile/fontsdialog.py +++ b/pysollib/tile/fontsdialog.py @@ -30,6 +30,7 @@ import tkFont # PySol imports from pysollib.mfxutil import KwStruct +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxDialog diff --git a/pysollib/tile/gameinfodialog.py b/pysollib/tile/gameinfodialog.py index 83e4cfbc..c53af971 100644 --- a/pysollib/tile/gameinfodialog.py +++ b/pysollib/tile/gameinfodialog.py @@ -28,6 +28,7 @@ __all__ = ['GameInfoDialog'] import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.gamedb import GI diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py index 8a77076e..ab9f5228 100644 --- a/pysollib/tile/menubar.py +++ b/pysollib/tile/menubar.py @@ -30,6 +30,7 @@ import ttk import tkFileDialog # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import Struct, kwdefault from pysollib.mfxutil import Image, USE_PIL from pysollib.util import CARDSET diff --git a/pysollib/tile/playeroptionsdialog.py b/pysollib/tile/playeroptionsdialog.py index 058f8101..c39817a9 100644 --- a/pysollib/tile/playeroptionsdialog.py +++ b/pysollib/tile/playeroptionsdialog.py @@ -28,6 +28,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index 603f5526..5b3cc0e5 100644 --- a/pysollib/tile/selectcardset.py +++ b/pysollib/tile/selectcardset.py @@ -30,6 +30,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct, USE_PIL from pysollib.util import CARDSET from pysollib.resource import CSI diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 55b530a4..825e38f5 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -28,6 +28,7 @@ import ttk from UserList import UserList # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import format_time from pysollib.gamedb import GI diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 341febe7..a1861a85 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -28,6 +28,7 @@ import ttk import tkColorChooser # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tile/solverdialog.py b/pysollib/tile/solverdialog.py index 0ec917a2..58c1213e 100644 --- a/pysollib/tile/solverdialog.py +++ b/pysollib/tile/solverdialog.py @@ -34,6 +34,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.settings import TITLE from pysollib.mfxutil import KwStruct diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index 22806b51..e6c4bb19 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -29,6 +29,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.settings import TITLE from pysollib.pysolaudio import pysolsoundserver diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py index 6fa0faa9..41590932 100644 --- a/pysollib/tile/statusbar.py +++ b/pysollib/tile/statusbar.py @@ -29,6 +29,7 @@ import os, sys import Tkinter import ttk +from pysollib.mygettext import _, n_ if __name__ == '__main__': d = os.path.abspath(os.path.join(sys.path[0], os.pardir, os.pardir)) sys.path.append(d) diff --git a/pysollib/tile/timeoutsdialog.py b/pysollib/tile/timeoutsdialog.py index 8583a338..5212b92c 100644 --- a/pysollib/tile/timeoutsdialog.py +++ b/pysollib/tile/timeoutsdialog.py @@ -28,6 +28,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 45c1a5a2..381df3e6 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -36,6 +36,7 @@ if __name__ == '__main__': gettext.install('pysol', d, unicode=True) # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import Struct, openURL from pysollib.settings import TITLE diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index cd383dc7..1f77d3fb 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -38,6 +38,7 @@ import ttk import tkFont # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.mfxutil import format_time ##from pysollib.util import * diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index 8094f67b..5d7fc5c9 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -39,6 +39,7 @@ import tkFont import traceback # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct, kwdefault, KwStruct, openURL from pysollib.settings import WIN_SYSTEM diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index 4fbe2882..b21433c3 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -29,6 +29,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct from pysollib.mfxutil import Image, ImageTk, ImageOps from pysollib.util import IMAGE_EXTENSIONS diff --git a/pysollib/tile/ttk.py b/pysollib/tile/ttk.py index 44e42f10..e6845eb0 100644 --- a/pysollib/tile/ttk.py +++ b/pysollib/tile/ttk.py @@ -26,6 +26,7 @@ __all__ = ["Button", "Checkbutton", "Combobox", "Entry", "Frame", "Label", "tclobjs_to_py"] import Tkinter +from pysollib.mygettext import _, n_ _flatten = Tkinter._flatten diff --git a/pysollib/tile/wizarddialog.py b/pysollib/tile/wizarddialog.py index ad37033a..955a63ac 100644 --- a/pysollib/tile/wizarddialog.py +++ b/pysollib/tile/wizarddialog.py @@ -29,6 +29,7 @@ import Tkinter import ttk # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.wizardutil import WizardWidgets from pysollib.wizardpresets import presets diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py index 2fd29050..a831288c 100644 --- a/pysollib/tk/colorsdialog.py +++ b/pysollib/tk/colorsdialog.py @@ -28,6 +28,7 @@ import Tkinter from tkColorChooser import askcolor # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py index bcf01a10..407b2c5b 100644 --- a/pysollib/tk/edittextdialog.py +++ b/pysollib/tk/edittextdialog.py @@ -27,6 +27,7 @@ __all__ = ['EditTextDialog'] import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index 0ac79554..3e7d3def 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -32,6 +32,7 @@ import Tkinter ##import traceback # PySol imports +from pysollib.mygettext import _, n_ # Toolkit imports from tkutil import after, after_cancel diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index a42405b8..4fae3328 100644 --- a/pysollib/tk/fontsdialog.py +++ b/pysollib/tk/fontsdialog.py @@ -28,6 +28,7 @@ import Tkinter import tkFont # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index 1d129594..2731e5de 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -28,6 +28,7 @@ __all__ = ['GameInfoDialog'] import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.gamedb import GI diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index def96b2c..ac1b4a09 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -29,6 +29,7 @@ import traceback import Tkinter, tkFileDialog # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import Struct, kwdefault from pysollib.mfxutil import Image, USE_PIL from pysollib.util import CARDSET diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py index d5470fe8..c46af7e5 100644 --- a/pysollib/tk/playeroptionsdialog.py +++ b/pysollib/tk/playeroptionsdialog.py @@ -27,6 +27,7 @@ __all__ = ['PlayerOptionsDialog'] import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct, Struct # Toolkit imports diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index 1b42c296..e7ecf1ec 100644 --- a/pysollib/tk/selectcardset.py +++ b/pysollib/tk/selectcardset.py @@ -28,6 +28,7 @@ import os import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct, USE_PIL from pysollib.util import CARDSET from pysollib.resource import CSI diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 68a98041..7846d0b1 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -28,6 +28,7 @@ import Tkinter from UserList import UserList # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import format_time from pysollib.gamedb import GI diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index 2d5491cc..d0528a98 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -26,6 +26,7 @@ import Tkinter, tkColorChooser # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py index 24ef810f..46ea1f11 100644 --- a/pysollib/tk/solverdialog.py +++ b/pysollib/tk/solverdialog.py @@ -34,6 +34,7 @@ import Tkinter ##import traceback # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.settings import TITLE diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index c5e816f3..f66011ac 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -28,6 +28,7 @@ import os import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.settings import TITLE from pysollib.pysolaudio import pysolsoundserver diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index c20380d6..c433022b 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -34,6 +34,7 @@ if __name__ == '__main__': gettext.install('pysol', d, unicode=True) # PySol imports +from pysollib.mygettext import _, n_ # Toolkit imports from tkwidget import MfxTooltip diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index e4e1aa2f..b9833830 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -27,6 +27,7 @@ __all__ = ['TimeoutsDialog'] import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct # Toolkit imports diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 4dc4da0d..f0b36553 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -35,6 +35,7 @@ if __name__ == '__main__': gettext.install('pysol', d, unicode=True) # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import Struct, openURL from pysollib.settings import TITLE diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 73bea2a0..6ab0f6f4 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -36,6 +36,7 @@ import time import Tkinter, tkFont # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import kwdefault, KwStruct from pysollib.mfxutil import format_time ##from pysollib.util import * diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 91694560..f41637da 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -38,6 +38,7 @@ import tkFont import traceback # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct, kwdefault, KwStruct, openURL from pysollib.settings import WIN_SYSTEM diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index d02bb061..62bc98b5 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -28,6 +28,7 @@ import os import Tkinter # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import destruct from pysollib.mfxutil import Image, ImageTk from pysollib.util import IMAGE_EXTENSIONS diff --git a/pysollib/tk/wizarddialog.py b/pysollib/tk/wizarddialog.py index 5592eb91..3294b652 100644 --- a/pysollib/tk/wizarddialog.py +++ b/pysollib/tk/wizarddialog.py @@ -29,6 +29,7 @@ import Tkinter from tabpage import TabPageSet # PySol imports +from pysollib.mygettext import _, n_ from pysollib.mfxutil import KwStruct from pysollib.wizardutil import WizardWidgets from pysollib.wizardpresets import presets diff --git a/pysollib/winsystems/common.py b/pysollib/winsystems/common.py index a5c093ca..7987b935 100644 --- a/pysollib/winsystems/common.py +++ b/pysollib/winsystems/common.py @@ -23,6 +23,7 @@ import sys, os, traceback +from pysollib.mygettext import _, n_ from pysollib.settings import TITLE from pysollib.settings import VERSION from pysollib.settings import TOOLKIT, USE_TILE