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

svn: r14091

po/test/po_test.py

@@ -172,7 +172,7 @@ def suite2():
         if glob.fnmatch.fnmatch(potfile,"*.py"):
             suite.addTest(TestGetText('test_gettext_py_%04d', potfile,
                                       ["import gettext",
-                                       "from gettext",
+                                       "from gen.ggettext",
                                        "import sgettext"]))
         elif glob.fnmatch.fnmatch(potfile,"*.glade"):
             suite.addTest(TestGetText('test_gettext_glade_%04d', potfile,

src/Assistant.py

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

src/Bookmarks.py

@@ -54,7 +54,7 @@ import GrampsDisplay
 import ListModel
 import Utils
 import const
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 
 #-------------------------------------------------------------------------
 #

src/ColumnOrder.py

@@ -27,7 +27,7 @@ Handle the column ordering
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import logging
 
 #-------------------------------------------------------------------------

src/DateEdit.py

@@ -61,7 +61,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from gen.lib import Date
 import DateHandler
 import const

src/DisplayState.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 from cStringIO import StringIO
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import os
 
 #-------------------------------------------------------------------------

src/ExportAssistant.py

@@ -29,7 +29,7 @@
 #-------------------------------------------------------------------------
 import os
 import sys
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/ExportOptions.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 import gtk
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import gobject
 
 #-------------------------------------------------------------------------

src/Filters/Rules/Event/_AllEvents.py

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

src/Filters/Rules/Event/_ChangedSince.py

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

src/Filters/Rules/Event/_EventPrivate.py

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

src/Filters/Rules/Event/_HasAttribute.py

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

src/Filters/Rules/Event/_HasData.py

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

src/Filters/Rules/Event/_HasGallery.py

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

src/Filters/Rules/Event/_HasIdOf.py

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

src/Filters/Rules/Event/_HasMarkerOf.py

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

src/Filters/Rules/Event/_HasNote.py

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

src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py

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

src/Filters/Rules/Event/_HasNoteRegexp.py

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

src/Filters/Rules/Event/_HasReferenceCountOf.py

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

src/Filters/Rules/Event/_HasSource.py

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

src/Filters/Rules/Event/_HasType.py

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

src/Filters/Rules/Event/_MatchesFilter.py

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

src/Filters/Rules/Event/_MatchesPersonFilter.py

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

src/Filters/Rules/Event/_MatchesSourceFilter.py

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

src/Filters/Rules/Event/_RegExpIdOf.py

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

src/Filters/Rules/Family/_AllFamilies.py

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

src/Filters/Rules/Family/_ChangedSince.py

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

src/Filters/Rules/Family/_ChildHasIdOf.py

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

src/Filters/Rules/Family/_ChildHasNameOf.py

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

src/Filters/Rules/Family/_FamilyPrivate.py

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

src/Filters/Rules/Family/_FatherHasIdOf.py

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

src/Filters/Rules/Family/_FatherHasNameOf.py

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

src/Filters/Rules/Family/_HasAttribute.py

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

src/Filters/Rules/Family/_HasEvent.py

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

src/Filters/Rules/Family/_HasGallery.py

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

src/Filters/Rules/Family/_HasIdOf.py

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

src/Filters/Rules/Family/_HasLDS.py

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

src/Filters/Rules/Family/_HasMarkerOf.py

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

src/Filters/Rules/Family/_HasNote.py

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

src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py

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

src/Filters/Rules/Family/_HasNoteRegexp.py

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

src/Filters/Rules/Family/_HasReferenceCountOf.py

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

src/Filters/Rules/Family/_HasRelType.py

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

src/Filters/Rules/Family/_HasSource.py

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

src/Filters/Rules/Family/_IsBookmarked.py

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

src/Filters/Rules/Family/_MatchesFilter.py

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

src/Filters/Rules/Family/_MotherHasIdOf.py

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

src/Filters/Rules/Family/_MotherHasNameOf.py

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

src/Filters/Rules/Family/_RegExpChildName.py

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

src/Filters/Rules/Family/_RegExpFatherName.py

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

src/Filters/Rules/Family/_RegExpIdOf.py

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

src/Filters/Rules/Family/_RegExpMotherName.py

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

src/Filters/Rules/Family/_SearchChildName.py

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

src/Filters/Rules/Family/_SearchFatherName.py

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

src/Filters/Rules/Family/_SearchMotherName.py

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

src/Filters/Rules/MediaObject/_AllMedia.py

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

src/Filters/Rules/MediaObject/_ChangedSince.py

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

src/Filters/Rules/MediaObject/_HasAttribute.py

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

src/Filters/Rules/MediaObject/_HasIdOf.py

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

src/Filters/Rules/MediaObject/_HasMedia.py

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

src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py

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

src/Filters/Rules/MediaObject/_HasNoteRegexp.py

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

src/Filters/Rules/MediaObject/_HasReferenceCountOf.py

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

src/Filters/Rules/MediaObject/_MatchesFilter.py

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

src/Filters/Rules/MediaObject/_MediaPrivate.py

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

src/Filters/Rules/MediaObject/_RegExpIdOf.py

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

src/Filters/Rules/Note/_AllNotes.py

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

src/Filters/Rules/Note/_ChangedSince.py

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

src/Filters/Rules/Note/_HasIdOf.py

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

src/Filters/Rules/Note/_HasMarkerOf.py

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

src/Filters/Rules/Note/_HasNote.py

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

src/Filters/Rules/Note/_HasReferenceCountOf.py

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

src/Filters/Rules/Note/_MatchesFilter.py

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

src/Filters/Rules/Note/_MatchesRegexpOf.py

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

src/Filters/Rules/Note/_MatchesSubstringOf.py

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

src/Filters/Rules/Note/_NotePrivate.py

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

src/Filters/Rules/Note/_RegExpIdOf.py

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

src/Filters/Rules/Person/_ChangedSince.py

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

src/Filters/Rules/Person/_DeepRelationshipPathBetween.py

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

src/Filters/Rules/Person/_Disconnected.py

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

src/Filters/Rules/Person/_Everyone.py

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

src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py

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

src/Filters/Rules/Person/_HasAddress.py

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

src/Filters/Rules/Person/_HasAssociation.py

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

src/Filters/Rules/Person/_HasAttribute.py

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

src/Filters/Rules/Person/_HasBirth.py

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

src/Filters/Rules/Person/_HasCommonAncestorWith.py

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

src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py

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

src/Filters/Rules/Person/_HasCompleteRecord.py

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

src/Filters/Rules/Person/_HasDeath.py

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

src/Filters/Rules/Person/_HasEvent.py

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

src/Filters/Rules/Person/_HasFamilyAttribute.py

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

src/Filters/Rules/Person/_HasFamilyEvent.py

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

src/Filters/Rules/Person/_HasGallery.py

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

src/Filters/Rules/Person/_HasIdOf.py

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

src/Filters/Rules/Person/_HasLDS.py

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

src/Filters/Rules/Person/_HasMarkerOf.py

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

src/Filters/Rules/Person/_HasNameOf.py

@@ -26,7 +26,7 @@
 # Standard Python modules
 #
 #-------------------------------------------------------------------------
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 
 #-------------------------------------------------------------------------
 #

src/Filters/Rules/Person/_HasNote.py

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