Move gettext, ngettext and sgettext calls into the new ggettext module. All of them return unicode all of the time.

svn: r14091

src/plugins/tool/CalculateEstimatedDates.py

@@ -29,7 +29,7 @@
 # python modules
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import time
 
 #------------------------------------------------------------------------

src/plugins/tool/ChangeNames.py

@@ -46,7 +46,7 @@ from gen.lib import Person
 
 from QuestionDialog import OkDialog
 from PluginUtils import Tool
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/ChangeTypes.py

@@ -28,8 +28,8 @@
 # standard python modules
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
-from gettext import ngettext
+from gen.ggettext import gettext as _
+from gen.ggettext import ngettext
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/Check.py

@@ -32,8 +32,8 @@ from __future__ import with_statement
 import os
 import cStringIO
 
-from gettext import gettext as _
-from gettext import ngettext
+from gen.ggettext import gettext as _
+from gen.ggettext import ngettext
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/DateParserDisplayTest.py

@@ -35,7 +35,7 @@ Tools/Debug/Check Localized Date Parser and Displayer
 #-------------------------------------------------------------------------
 import traceback
 import sys
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/Desbrowser.py

@@ -40,7 +40,7 @@ from gen.display.name import displayer as name_displayer
 from PluginUtils import Tool
 import GrampsDisplay
 import ManagedWindow
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 from gui.editors import EditPerson
 

src/plugins/tool/DumpGenderStats.py

@@ -25,7 +25,7 @@
     
     Tools/Debug/Dump Gender Statistics
 """
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import gtk
 import ListModel
 import ManagedWindow

src/plugins/tool/Eval.py

@@ -31,7 +31,7 @@ Provide a python evaluation window
 #------------------------------------------------------------------------
 import cStringIO
 import sys
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import traceback
 
 #------------------------------------------------------------------------

src/plugins/tool/EventCmp.py

@@ -56,7 +56,7 @@ from PluginUtils import Tool
 from ReportBase import ReportUtils
 import GrampsDisplay 
 import ManagedWindow
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 from gui.filtereditor import FilterEditor
 

src/plugins/tool/EventNames.py

@@ -28,8 +28,8 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
-from gettext import ngettext
+from gen.ggettext import gettext as _
+from gen.ggettext import ngettext
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/ExtractCity.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 import re
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/FindDupes.py

@@ -48,7 +48,7 @@ import GrampsDisplay
 import ManagedWindow
 from PluginUtils import Tool
 from QuestionDialog import RunDatabaseRepair
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/Leak.py

@@ -30,7 +30,7 @@ Show uncollected objects in a window.
 # standard python modules
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 from bsddb.db import DBError
 
 #------------------------------------------------------------------------

src/plugins/tool/MediaManager.py

@@ -55,7 +55,7 @@ from gen.lib import MediaObject
 from gen.updatecallback import UpdateCallback
 from PluginUtils import Tool
 from Utils import media_path_full, relative_path, media_path
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/NotRelated.py

@@ -37,14 +37,14 @@ import gobject
 #
 #------------------------------------------------------------------------
 import const
-from gettext import ngettext
+from gen.ggettext import ngettext
 from PluginUtils import Tool
 from ReportBase import ReportUtils
 from gui.editors import EditPerson, EditFamily
 import ManagedWindow
 from gui.utils import ProgressMeter
 import GrampsDisplay
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/OwnerEditor.py

@@ -42,7 +42,7 @@ import GrampsDisplay
 from gui.widgets import MonitoredEntry
 import ManagedWindow
 from PluginUtils import Tool
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/PHPGedViewConnector.py

@@ -28,7 +28,7 @@ import urllib2
 import gtk
 import os
 from tempfile import mkstemp
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 from glade import Glade
 import libgedcom
 

src/plugins/tool/PatchNames.py

@@ -50,7 +50,7 @@ from QuestionDialog import OkDialog
 import ManagedWindow
 import GrampsDisplay
 import gen.lib
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/Rebuild.py

@@ -28,7 +28,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/RebuildRefMap.py

@@ -30,7 +30,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/RelCalc.py

@@ -29,7 +29,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/RemoveUnused.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 from __future__ import with_statement
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/ReorderIds.py

@@ -32,7 +32,7 @@ scheme specified in the database's prefix ids
 #
 #------------------------------------------------------------------------
 import re
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/tool/SortEvents.py

@@ -27,7 +27,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/SoundGen.py

@@ -33,7 +33,7 @@ import soundex
 import GrampsDisplay
 import ManagedWindow
 import AutoComp
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from PluginUtils import Tool
 from glade import Glade
 

src/plugins/tool/TestcaseGenerator.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 from random import randint,choice,random
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/tool/Verify.py

@@ -60,7 +60,7 @@ import GrampsDisplay
 from ManagedWindow import ManagedWindow
 from gen.updatecallback import UpdateCallback
 from PluginUtils import Tool
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from glade import Glade
 
 #-------------------------------------------------------------------------