diff --git a/po/test/po_test.py b/po/test/po_test.py index ead79831a..6d170b9e6 100644 --- a/po/test/po_test.py +++ b/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, diff --git a/src/Assistant.py b/src/Assistant.py index e8311e3f7..3ff3c8b6d 100644 --- a/src/Assistant.py +++ b/src/Assistant.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/Bookmarks.py b/src/Bookmarks.py index 6a41d2bd4..dd0faf694 100644 --- a/src/Bookmarks.py +++ b/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 _ #------------------------------------------------------------------------- # diff --git a/src/ColumnOrder.py b/src/ColumnOrder.py index fc6bb4440..d62632db0 100644 --- a/src/ColumnOrder.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/DateEdit.py b/src/DateEdit.py index dac59b27b..07d3fc6f9 100644 --- a/src/DateEdit.py +++ b/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 diff --git a/src/DisplayState.py b/src/DisplayState.py index 2ed5c7074..96f6a54e0 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- from cStringIO import StringIO -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/ExportAssistant.py b/src/ExportAssistant.py index defed98c8..7f3936102 100644 --- a/src/ExportAssistant.py +++ b/src/ExportAssistant.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import sys -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/ExportOptions.py b/src/ExportOptions.py index 811d31a13..7a1622892 100644 --- a/src/ExportOptions.py +++ b/src/ExportOptions.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import gtk -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gobject #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/Event/_AllEvents.py b/src/Filters/Rules/Event/_AllEvents.py index c2aa15507..1b7198834 100644 --- a/src/Filters/Rules/Event/_AllEvents.py +++ b/src/Filters/Rules/Event/_AllEvents.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_ChangedSince.py b/src/Filters/Rules/Event/_ChangedSince.py index 7162645bf..13292c3a0 100644 --- a/src/Filters/Rules/Event/_ChangedSince.py +++ b/src/Filters/Rules/Event/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_EventPrivate.py b/src/Filters/Rules/Event/_EventPrivate.py index da8d1481c..a7ef4cecf 100644 --- a/src/Filters/Rules/Event/_EventPrivate.py +++ b/src/Filters/Rules/Event/_EventPrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasAttribute.py b/src/Filters/Rules/Event/_HasAttribute.py index 8ca1e6a00..c3066b256 100644 --- a/src/Filters/Rules/Event/_HasAttribute.py +++ b/src/Filters/Rules/Event/_HasAttribute.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasData.py b/src/Filters/Rules/Event/_HasData.py index 26357eacb..d83243950 100644 --- a/src/Filters/Rules/Event/_HasData.py +++ b/src/Filters/Rules/Event/_HasData.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasGallery.py b/src/Filters/Rules/Event/_HasGallery.py index eaebac31f..d63a8c074 100755 --- a/src/Filters/Rules/Event/_HasGallery.py +++ b/src/Filters/Rules/Event/_HasGallery.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasIdOf.py b/src/Filters/Rules/Event/_HasIdOf.py index 259f211f9..2cf9991ba 100644 --- a/src/Filters/Rules/Event/_HasIdOf.py +++ b/src/Filters/Rules/Event/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasMarkerOf.py b/src/Filters/Rules/Event/_HasMarkerOf.py index 38db4323e..de895787c 100644 --- a/src/Filters/Rules/Event/_HasMarkerOf.py +++ b/src/Filters/Rules/Event/_HasMarkerOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasNote.py b/src/Filters/Rules/Event/_HasNote.py index 863b80999..80a58c069 100755 --- a/src/Filters/Rules/Event/_HasNote.py +++ b/src/Filters/Rules/Event/_HasNote.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py index c6040fcf6..dbfed5b70 100644 --- a/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Event/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasNoteRegexp.py b/src/Filters/Rules/Event/_HasNoteRegexp.py index 5c2a7bb24..9d5eada55 100644 --- a/src/Filters/Rules/Event/_HasNoteRegexp.py +++ b/src/Filters/Rules/Event/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasReferenceCountOf.py b/src/Filters/Rules/Event/_HasReferenceCountOf.py index 17754fe6a..adc295e62 100644 --- a/src/Filters/Rules/Event/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Event/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasSource.py b/src/Filters/Rules/Event/_HasSource.py index abcdc3181..a79915d8c 100644 --- a/src/Filters/Rules/Event/_HasSource.py +++ b/src/Filters/Rules/Event/_HasSource.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_HasType.py b/src/Filters/Rules/Event/_HasType.py index 8d0611406..a4db16b20 100644 --- a/src/Filters/Rules/Event/_HasType.py +++ b/src/Filters/Rules/Event/_HasType.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesFilter.py b/src/Filters/Rules/Event/_MatchesFilter.py index 08c37e0ed..ce41c203a 100644 --- a/src/Filters/Rules/Event/_MatchesFilter.py +++ b/src/Filters/Rules/Event/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesPersonFilter.py b/src/Filters/Rules/Event/_MatchesPersonFilter.py index 6d81a4a95..55b424d36 100644 --- a/src/Filters/Rules/Event/_MatchesPersonFilter.py +++ b/src/Filters/Rules/Event/_MatchesPersonFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_MatchesSourceFilter.py b/src/Filters/Rules/Event/_MatchesSourceFilter.py index 2931d797b..21ee4a251 100644 --- a/src/Filters/Rules/Event/_MatchesSourceFilter.py +++ b/src/Filters/Rules/Event/_MatchesSourceFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Event/_RegExpIdOf.py b/src/Filters/Rules/Event/_RegExpIdOf.py index e70840ca6..4aab823df 100644 --- a/src/Filters/Rules/Event/_RegExpIdOf.py +++ b/src/Filters/Rules/Event/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_AllFamilies.py b/src/Filters/Rules/Family/_AllFamilies.py index 282f1d370..3523139b2 100644 --- a/src/Filters/Rules/Family/_AllFamilies.py +++ b/src/Filters/Rules/Family/_AllFamilies.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_ChangedSince.py b/src/Filters/Rules/Family/_ChangedSince.py index f72f5cc1a..f0d2a9d15 100644 --- a/src/Filters/Rules/Family/_ChangedSince.py +++ b/src/Filters/Rules/Family/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_ChildHasIdOf.py b/src/Filters/Rules/Family/_ChildHasIdOf.py index c953727cb..837ac8c2f 100644 --- a/src/Filters/Rules/Family/_ChildHasIdOf.py +++ b/src/Filters/Rules/Family/_ChildHasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_ChildHasNameOf.py b/src/Filters/Rules/Family/_ChildHasNameOf.py index ca301e779..39dc5e2af 100644 --- a/src/Filters/Rules/Family/_ChildHasNameOf.py +++ b/src/Filters/Rules/Family/_ChildHasNameOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_FamilyPrivate.py b/src/Filters/Rules/Family/_FamilyPrivate.py index 2ae068c0a..d1ab07c15 100644 --- a/src/Filters/Rules/Family/_FamilyPrivate.py +++ b/src/Filters/Rules/Family/_FamilyPrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_FatherHasIdOf.py b/src/Filters/Rules/Family/_FatherHasIdOf.py index 5e8ab670c..e970edfdb 100644 --- a/src/Filters/Rules/Family/_FatherHasIdOf.py +++ b/src/Filters/Rules/Family/_FatherHasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_FatherHasNameOf.py b/src/Filters/Rules/Family/_FatherHasNameOf.py index c208795e8..66c2de14c 100644 --- a/src/Filters/Rules/Family/_FatherHasNameOf.py +++ b/src/Filters/Rules/Family/_FatherHasNameOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasAttribute.py b/src/Filters/Rules/Family/_HasAttribute.py index 034d5b59a..21e6f3603 100644 --- a/src/Filters/Rules/Family/_HasAttribute.py +++ b/src/Filters/Rules/Family/_HasAttribute.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasEvent.py b/src/Filters/Rules/Family/_HasEvent.py index 4e078e20d..f7b9386c2 100644 --- a/src/Filters/Rules/Family/_HasEvent.py +++ b/src/Filters/Rules/Family/_HasEvent.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasGallery.py b/src/Filters/Rules/Family/_HasGallery.py index 766ad5f89..0f0e7c2c2 100755 --- a/src/Filters/Rules/Family/_HasGallery.py +++ b/src/Filters/Rules/Family/_HasGallery.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasIdOf.py b/src/Filters/Rules/Family/_HasIdOf.py index ac8ff153d..74d4fecd2 100644 --- a/src/Filters/Rules/Family/_HasIdOf.py +++ b/src/Filters/Rules/Family/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasLDS.py b/src/Filters/Rules/Family/_HasLDS.py index ae956a2bb..409a70d07 100755 --- a/src/Filters/Rules/Family/_HasLDS.py +++ b/src/Filters/Rules/Family/_HasLDS.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasMarkerOf.py b/src/Filters/Rules/Family/_HasMarkerOf.py index b4c803118..a4065309c 100644 --- a/src/Filters/Rules/Family/_HasMarkerOf.py +++ b/src/Filters/Rules/Family/_HasMarkerOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasNote.py b/src/Filters/Rules/Family/_HasNote.py index 4a2e40851..2c881dfdf 100755 --- a/src/Filters/Rules/Family/_HasNote.py +++ b/src/Filters/Rules/Family/_HasNote.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py index 2c255561c..8a9d83af8 100644 --- a/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Family/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasNoteRegexp.py b/src/Filters/Rules/Family/_HasNoteRegexp.py index 4ab6ae9e7..338e445aa 100644 --- a/src/Filters/Rules/Family/_HasNoteRegexp.py +++ b/src/Filters/Rules/Family/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasReferenceCountOf.py b/src/Filters/Rules/Family/_HasReferenceCountOf.py index 0e4e5602a..be93ccaff 100644 --- a/src/Filters/Rules/Family/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Family/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasRelType.py b/src/Filters/Rules/Family/_HasRelType.py index f30e010e0..b76c148f7 100644 --- a/src/Filters/Rules/Family/_HasRelType.py +++ b/src/Filters/Rules/Family/_HasRelType.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_HasSource.py b/src/Filters/Rules/Family/_HasSource.py index c68c7b080..0cbb70f6d 100755 --- a/src/Filters/Rules/Family/_HasSource.py +++ b/src/Filters/Rules/Family/_HasSource.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_IsBookmarked.py b/src/Filters/Rules/Family/_IsBookmarked.py index b7493e9e2..e8fb1654d 100644 --- a/src/Filters/Rules/Family/_IsBookmarked.py +++ b/src/Filters/Rules/Family/_IsBookmarked.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_MatchesFilter.py b/src/Filters/Rules/Family/_MatchesFilter.py index f55b0855c..d22adfa11 100644 --- a/src/Filters/Rules/Family/_MatchesFilter.py +++ b/src/Filters/Rules/Family/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_MotherHasIdOf.py b/src/Filters/Rules/Family/_MotherHasIdOf.py index b46451952..01292685e 100644 --- a/src/Filters/Rules/Family/_MotherHasIdOf.py +++ b/src/Filters/Rules/Family/_MotherHasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_MotherHasNameOf.py b/src/Filters/Rules/Family/_MotherHasNameOf.py index 90ef4db53..23b2e5c30 100644 --- a/src/Filters/Rules/Family/_MotherHasNameOf.py +++ b/src/Filters/Rules/Family/_MotherHasNameOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_RegExpChildName.py b/src/Filters/Rules/Family/_RegExpChildName.py index 2489b7d48..1e0c6b0d4 100644 --- a/src/Filters/Rules/Family/_RegExpChildName.py +++ b/src/Filters/Rules/Family/_RegExpChildName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_RegExpFatherName.py b/src/Filters/Rules/Family/_RegExpFatherName.py index 1f289d11d..3489c9e56 100644 --- a/src/Filters/Rules/Family/_RegExpFatherName.py +++ b/src/Filters/Rules/Family/_RegExpFatherName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_RegExpIdOf.py b/src/Filters/Rules/Family/_RegExpIdOf.py index b91bb0715..8a37754bd 100644 --- a/src/Filters/Rules/Family/_RegExpIdOf.py +++ b/src/Filters/Rules/Family/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_RegExpMotherName.py b/src/Filters/Rules/Family/_RegExpMotherName.py index e35c8620b..4e0dad2dd 100644 --- a/src/Filters/Rules/Family/_RegExpMotherName.py +++ b/src/Filters/Rules/Family/_RegExpMotherName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_SearchChildName.py b/src/Filters/Rules/Family/_SearchChildName.py index 62c109636..4603d3f2e 100644 --- a/src/Filters/Rules/Family/_SearchChildName.py +++ b/src/Filters/Rules/Family/_SearchChildName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_SearchFatherName.py b/src/Filters/Rules/Family/_SearchFatherName.py index a37f446f8..4260d44a1 100644 --- a/src/Filters/Rules/Family/_SearchFatherName.py +++ b/src/Filters/Rules/Family/_SearchFatherName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Family/_SearchMotherName.py b/src/Filters/Rules/Family/_SearchMotherName.py index 899f0238b..a90cfc404 100644 --- a/src/Filters/Rules/Family/_SearchMotherName.py +++ b/src/Filters/Rules/Family/_SearchMotherName.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_AllMedia.py b/src/Filters/Rules/MediaObject/_AllMedia.py index e420c0e93..7b0277495 100644 --- a/src/Filters/Rules/MediaObject/_AllMedia.py +++ b/src/Filters/Rules/MediaObject/_AllMedia.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_ChangedSince.py b/src/Filters/Rules/MediaObject/_ChangedSince.py index af5dd859f..3f62a3aaa 100644 --- a/src/Filters/Rules/MediaObject/_ChangedSince.py +++ b/src/Filters/Rules/MediaObject/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasAttribute.py b/src/Filters/Rules/MediaObject/_HasAttribute.py index 3f5f02fd8..756c1b29e 100644 --- a/src/Filters/Rules/MediaObject/_HasAttribute.py +++ b/src/Filters/Rules/MediaObject/_HasAttribute.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasIdOf.py b/src/Filters/Rules/MediaObject/_HasIdOf.py index a5907e1cb..2a88492c2 100644 --- a/src/Filters/Rules/MediaObject/_HasIdOf.py +++ b/src/Filters/Rules/MediaObject/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasMedia.py b/src/Filters/Rules/MediaObject/_HasMedia.py index dce56e0ec..4e548d876 100644 --- a/src/Filters/Rules/MediaObject/_HasMedia.py +++ b/src/Filters/Rules/MediaObject/_HasMedia.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py index 7b94724c9..c456e9745 100644 --- a/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/MediaObject/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasNoteRegexp.py b/src/Filters/Rules/MediaObject/_HasNoteRegexp.py index be52f3de9..85585453f 100644 --- a/src/Filters/Rules/MediaObject/_HasNoteRegexp.py +++ b/src/Filters/Rules/MediaObject/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py b/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py index 5a9d50dda..3fbb8339a 100644 --- a/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py +++ b/src/Filters/Rules/MediaObject/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_MatchesFilter.py b/src/Filters/Rules/MediaObject/_MatchesFilter.py index cbde149b4..b43a8a221 100644 --- a/src/Filters/Rules/MediaObject/_MatchesFilter.py +++ b/src/Filters/Rules/MediaObject/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_MediaPrivate.py b/src/Filters/Rules/MediaObject/_MediaPrivate.py index 86337824f..22eb996d9 100644 --- a/src/Filters/Rules/MediaObject/_MediaPrivate.py +++ b/src/Filters/Rules/MediaObject/_MediaPrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/MediaObject/_RegExpIdOf.py b/src/Filters/Rules/MediaObject/_RegExpIdOf.py index d69acc904..18f69638e 100644 --- a/src/Filters/Rules/MediaObject/_RegExpIdOf.py +++ b/src/Filters/Rules/MediaObject/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_AllNotes.py b/src/Filters/Rules/Note/_AllNotes.py index 75448acf2..2d6a8291e 100644 --- a/src/Filters/Rules/Note/_AllNotes.py +++ b/src/Filters/Rules/Note/_AllNotes.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_ChangedSince.py b/src/Filters/Rules/Note/_ChangedSince.py index 5c715e748..83dc2e50f 100644 --- a/src/Filters/Rules/Note/_ChangedSince.py +++ b/src/Filters/Rules/Note/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasIdOf.py b/src/Filters/Rules/Note/_HasIdOf.py index 22d61cfe8..fd9e3f072 100644 --- a/src/Filters/Rules/Note/_HasIdOf.py +++ b/src/Filters/Rules/Note/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasMarkerOf.py b/src/Filters/Rules/Note/_HasMarkerOf.py index 10c6b3ef8..73be2448a 100644 --- a/src/Filters/Rules/Note/_HasMarkerOf.py +++ b/src/Filters/Rules/Note/_HasMarkerOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasNote.py b/src/Filters/Rules/Note/_HasNote.py index d452629d0..007fce181 100644 --- a/src/Filters/Rules/Note/_HasNote.py +++ b/src/Filters/Rules/Note/_HasNote.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_HasReferenceCountOf.py b/src/Filters/Rules/Note/_HasReferenceCountOf.py index 95990af97..3a5860546 100644 --- a/src/Filters/Rules/Note/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Note/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_MatchesFilter.py b/src/Filters/Rules/Note/_MatchesFilter.py index d8ff1fb63..9825a9138 100644 --- a/src/Filters/Rules/Note/_MatchesFilter.py +++ b/src/Filters/Rules/Note/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_MatchesRegexpOf.py b/src/Filters/Rules/Note/_MatchesRegexpOf.py index ac3c60f8b..4fbf2ce1f 100644 --- a/src/Filters/Rules/Note/_MatchesRegexpOf.py +++ b/src/Filters/Rules/Note/_MatchesRegexpOf.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------- import re -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_MatchesSubstringOf.py b/src/Filters/Rules/Note/_MatchesSubstringOf.py index e8a5a35a8..3b5afdf1c 100644 --- a/src/Filters/Rules/Note/_MatchesSubstringOf.py +++ b/src/Filters/Rules/Note/_MatchesSubstringOf.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_NotePrivate.py b/src/Filters/Rules/Note/_NotePrivate.py index 26a7b7cb3..9d5ff71d7 100644 --- a/src/Filters/Rules/Note/_NotePrivate.py +++ b/src/Filters/Rules/Note/_NotePrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Note/_RegExpIdOf.py b/src/Filters/Rules/Note/_RegExpIdOf.py index 5e12fdca4..11f2d7374 100644 --- a/src/Filters/Rules/Note/_RegExpIdOf.py +++ b/src/Filters/Rules/Note/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_ChangedSince.py b/src/Filters/Rules/Person/_ChangedSince.py index c75344634..d6c10a3af 100644 --- a/src/Filters/Rules/Person/_ChangedSince.py +++ b/src/Filters/Rules/Person/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py b/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py index 954fe194f..7b50157b1 100644 --- a/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py +++ b/src/Filters/Rules/Person/_DeepRelationshipPathBetween.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_Disconnected.py b/src/Filters/Rules/Person/_Disconnected.py index f0c3a33cd..56d9e13ee 100644 --- a/src/Filters/Rules/Person/_Disconnected.py +++ b/src/Filters/Rules/Person/_Disconnected.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_Everyone.py b/src/Filters/Rules/Person/_Everyone.py index 8288e96ac..837872fa5 100644 --- a/src/Filters/Rules/Person/_Everyone.py +++ b/src/Filters/Rules/Person/_Everyone.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py b/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py index 16fa68859..cd3496e0f 100644 --- a/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py +++ b/src/Filters/Rules/Person/_FamilyWithIncompleteEvent.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAddress.py b/src/Filters/Rules/Person/_HasAddress.py index 0d0426208..605167d6b 100755 --- a/src/Filters/Rules/Person/_HasAddress.py +++ b/src/Filters/Rules/Person/_HasAddress.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAssociation.py b/src/Filters/Rules/Person/_HasAssociation.py index 4ee9093ae..70d7ee62c 100755 --- a/src/Filters/Rules/Person/_HasAssociation.py +++ b/src/Filters/Rules/Person/_HasAssociation.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasAttribute.py b/src/Filters/Rules/Person/_HasAttribute.py index eec509e44..b7f2b75a7 100644 --- a/src/Filters/Rules/Person/_HasAttribute.py +++ b/src/Filters/Rules/Person/_HasAttribute.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasBirth.py b/src/Filters/Rules/Person/_HasBirth.py index 1afbe1ff2..b1022ac74 100644 --- a/src/Filters/Rules/Person/_HasBirth.py +++ b/src/Filters/Rules/Person/_HasBirth.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCommonAncestorWith.py b/src/Filters/Rules/Person/_HasCommonAncestorWith.py index 3b6c2ce37..fdd7f0851 100644 --- a/src/Filters/Rules/Person/_HasCommonAncestorWith.py +++ b/src/Filters/Rules/Person/_HasCommonAncestorWith.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py b/src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py index ec6699a92..67166d172 100644 --- a/src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py +++ b/src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasCompleteRecord.py b/src/Filters/Rules/Person/_HasCompleteRecord.py index 64c4038f4..4ba674850 100644 --- a/src/Filters/Rules/Person/_HasCompleteRecord.py +++ b/src/Filters/Rules/Person/_HasCompleteRecord.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasDeath.py b/src/Filters/Rules/Person/_HasDeath.py index c54375b11..458ad399b 100644 --- a/src/Filters/Rules/Person/_HasDeath.py +++ b/src/Filters/Rules/Person/_HasDeath.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasEvent.py b/src/Filters/Rules/Person/_HasEvent.py index b4ea4fe82..f5a3be11f 100644 --- a/src/Filters/Rules/Person/_HasEvent.py +++ b/src/Filters/Rules/Person/_HasEvent.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasFamilyAttribute.py b/src/Filters/Rules/Person/_HasFamilyAttribute.py index 471a71991..5033bc295 100644 --- a/src/Filters/Rules/Person/_HasFamilyAttribute.py +++ b/src/Filters/Rules/Person/_HasFamilyAttribute.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasFamilyEvent.py b/src/Filters/Rules/Person/_HasFamilyEvent.py index 648487a4b..bab903968 100644 --- a/src/Filters/Rules/Person/_HasFamilyEvent.py +++ b/src/Filters/Rules/Person/_HasFamilyEvent.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasGallery.py b/src/Filters/Rules/Person/_HasGallery.py index 699346b91..a2646eb55 100644 --- a/src/Filters/Rules/Person/_HasGallery.py +++ b/src/Filters/Rules/Person/_HasGallery.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasIdOf.py b/src/Filters/Rules/Person/_HasIdOf.py index 35d100c89..9b683ae92 100644 --- a/src/Filters/Rules/Person/_HasIdOf.py +++ b/src/Filters/Rules/Person/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasLDS.py b/src/Filters/Rules/Person/_HasLDS.py index 6d5a331a0..b6f23e510 100755 --- a/src/Filters/Rules/Person/_HasLDS.py +++ b/src/Filters/Rules/Person/_HasLDS.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasMarkerOf.py b/src/Filters/Rules/Person/_HasMarkerOf.py index 4f811ecde..964ef4f88 100644 --- a/src/Filters/Rules/Person/_HasMarkerOf.py +++ b/src/Filters/Rules/Person/_HasMarkerOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNameOf.py b/src/Filters/Rules/Person/_HasNameOf.py index 461ffe237..02308fd5a 100644 --- a/src/Filters/Rules/Person/_HasNameOf.py +++ b/src/Filters/Rules/Person/_HasNameOf.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNote.py b/src/Filters/Rules/Person/_HasNote.py index 806362b55..859004272 100644 --- a/src/Filters/Rules/Person/_HasNote.py +++ b/src/Filters/Rules/Person/_HasNote.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py index ec616c1c6..c6e91e152 100644 --- a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasNoteRegexp.py b/src/Filters/Rules/Person/_HasNoteRegexp.py index 60e10db1f..56feaa5b1 100644 --- a/src/Filters/Rules/Person/_HasNoteRegexp.py +++ b/src/Filters/Rules/Person/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasRelationship.py b/src/Filters/Rules/Person/_HasRelationship.py index 736c486cd..98c0988d8 100644 --- a/src/Filters/Rules/Person/_HasRelationship.py +++ b/src/Filters/Rules/Person/_HasRelationship.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasSource.py b/src/Filters/Rules/Person/_HasSource.py index 1db4d5f64..bebdf9f94 100755 --- a/src/Filters/Rules/Person/_HasSource.py +++ b/src/Filters/Rules/Person/_HasSource.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasSourceOf.py b/src/Filters/Rules/Person/_HasSourceOf.py index 45e599fc0..becb49437 100644 --- a/src/Filters/Rules/Person/_HasSourceOf.py +++ b/src/Filters/Rules/Person/_HasSourceOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py b/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py index 1d3fd7868..d14ce9b45 100644 --- a/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py +++ b/src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HasUnknownGender.py b/src/Filters/Rules/Person/_HasUnknownGender.py index 2147190cc..3c0ca47a2 100644 --- a/src/Filters/Rules/Person/_HasUnknownGender.py +++ b/src/Filters/Rules/Person/_HasUnknownGender.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HaveAltFamilies.py b/src/Filters/Rules/Person/_HaveAltFamilies.py index df2e0b0d2..21949292e 100644 --- a/src/Filters/Rules/Person/_HaveAltFamilies.py +++ b/src/Filters/Rules/Person/_HaveAltFamilies.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_HaveChildren.py b/src/Filters/Rules/Person/_HaveChildren.py index 1a84fbb37..03fc19965 100644 --- a/src/Filters/Rules/Person/_HaveChildren.py +++ b/src/Filters/Rules/Person/_HaveChildren.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IncompleteNames.py b/src/Filters/Rules/Person/_IncompleteNames.py index 78b8aba80..7fed919e3 100644 --- a/src/Filters/Rules/Person/_IncompleteNames.py +++ b/src/Filters/Rules/Person/_IncompleteNames.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsAncestorOf.py b/src/Filters/Rules/Person/_IsAncestorOf.py index 51ad11056..4caff6817 100644 --- a/src/Filters/Rules/Person/_IsAncestorOf.py +++ b/src/Filters/Rules/Person/_IsAncestorOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py b/src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py index f5eb369b0..57d4715ea 100644 --- a/src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsBookmarked.py b/src/Filters/Rules/Person/_IsBookmarked.py index b210bc978..dd5740e8a 100644 --- a/src/Filters/Rules/Person/_IsBookmarked.py +++ b/src/Filters/Rules/Person/_IsBookmarked.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsChildOfFilterMatch.py b/src/Filters/Rules/Person/_IsChildOfFilterMatch.py index 24b142402..6b0657581 100644 --- a/src/Filters/Rules/Person/_IsChildOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsChildOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDefaultPerson.py b/src/Filters/Rules/Person/_IsDefaultPerson.py index 3bbfb0f6f..3bb20ce71 100644 --- a/src/Filters/Rules/Person/_IsDefaultPerson.py +++ b/src/Filters/Rules/Person/_IsDefaultPerson.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDescendantFamilyOf.py b/src/Filters/Rules/Person/_IsDescendantFamilyOf.py index b61f09acd..db54f702d 100644 --- a/src/Filters/Rules/Person/_IsDescendantFamilyOf.py +++ b/src/Filters/Rules/Person/_IsDescendantFamilyOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ try: set() except NameError: diff --git a/src/Filters/Rules/Person/_IsDescendantOf.py b/src/Filters/Rules/Person/_IsDescendantOf.py index 4cccf93aa..a15608c02 100644 --- a/src/Filters/Rules/Person/_IsDescendantOf.py +++ b/src/Filters/Rules/Person/_IsDescendantOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py b/src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py index 8b9925c97..01332eb3b 100644 --- a/src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsFemale.py b/src/Filters/Rules/Person/_IsFemale.py index a5f1e6dfa..b36f72eef 100644 --- a/src/Filters/Rules/Person/_IsFemale.py +++ b/src/Filters/Rules/Person/_IsFemale.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py index a52e2d533..7e50ba2fd 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py +++ b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py index 9494c9284..4a6d5da0f 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py +++ b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfBookmarked.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ try: set() diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py index 46ff4851d..293ea694d 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py +++ b/src/Filters/Rules/Person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py b/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py index 8263ded80..f7c4fc101 100644 --- a/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py +++ b/src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsMale.py b/src/Filters/Rules/Person/_IsMale.py index 466502959..83f4194c2 100644 --- a/src/Filters/Rules/Person/_IsMale.py +++ b/src/Filters/Rules/Person/_IsMale.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py b/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py index ac204f56e..56a169b1b 100644 --- a/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py +++ b/src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py b/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py index ac6ba626b..399d3733d 100644 --- a/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py +++ b/src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsParentOfFilterMatch.py b/src/Filters/Rules/Person/_IsParentOfFilterMatch.py index 0d405c827..c9f64cbe2 100644 --- a/src/Filters/Rules/Person/_IsParentOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsParentOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py b/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py index e34b09213..20df7079e 100644 --- a/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py b/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py index e1444a82e..c0ddd865a 100644 --- a/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py +++ b/src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_IsWitness.py b/src/Filters/Rules/Person/_IsWitness.py index 88d4aa3a5..73d76d632 100644 --- a/src/Filters/Rules/Person/_IsWitness.py +++ b/src/Filters/Rules/Person/_IsWitness.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchIdOf.py b/src/Filters/Rules/Person/_MatchIdOf.py index 84c299f0a..e70c0acb5 100644 --- a/src/Filters/Rules/Person/_MatchIdOf.py +++ b/src/Filters/Rules/Person/_MatchIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchesEventFilter.py b/src/Filters/Rules/Person/_MatchesEventFilter.py index a0b7325e7..f1e00080f 100644 --- a/src/Filters/Rules/Person/_MatchesEventFilter.py +++ b/src/Filters/Rules/Person/_MatchesEventFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MatchesFilter.py b/src/Filters/Rules/Person/_MatchesFilter.py index 474dc7a66..564ae745b 100644 --- a/src/Filters/Rules/Person/_MatchesFilter.py +++ b/src/Filters/Rules/Person/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MissingParent.py b/src/Filters/Rules/Person/_MissingParent.py index 7082bc901..23de2b2ec 100644 --- a/src/Filters/Rules/Person/_MissingParent.py +++ b/src/Filters/Rules/Person/_MissingParent.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_MultipleMarriages.py b/src/Filters/Rules/Person/_MultipleMarriages.py index 39b9384eb..2438b543c 100644 --- a/src/Filters/Rules/Person/_MultipleMarriages.py +++ b/src/Filters/Rules/Person/_MultipleMarriages.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_NeverMarried.py b/src/Filters/Rules/Person/_NeverMarried.py index d7cc6d909..156e2ee45 100644 --- a/src/Filters/Rules/Person/_NeverMarried.py +++ b/src/Filters/Rules/Person/_NeverMarried.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_NoBirthdate.py b/src/Filters/Rules/Person/_NoBirthdate.py index 6485344b8..2a7058f90 100644 --- a/src/Filters/Rules/Person/_NoBirthdate.py +++ b/src/Filters/Rules/Person/_NoBirthdate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_PeoplePrivate.py b/src/Filters/Rules/Person/_PeoplePrivate.py index bf7a7fb66..94845fffe 100644 --- a/src/Filters/Rules/Person/_PeoplePrivate.py +++ b/src/Filters/Rules/Person/_PeoplePrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py b/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py index 46b99651f..9b261f478 100644 --- a/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py +++ b/src/Filters/Rules/Person/_PersonWithIncompleteEvent.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_ProbablyAlive.py b/src/Filters/Rules/Person/_ProbablyAlive.py index e25ddab45..a75b0cf3a 100644 --- a/src/Filters/Rules/Person/_ProbablyAlive.py +++ b/src/Filters/Rules/Person/_ProbablyAlive.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RegExpIdOf.py b/src/Filters/Rules/Person/_RegExpIdOf.py index b54826207..a7a1ccdc3 100644 --- a/src/Filters/Rules/Person/_RegExpIdOf.py +++ b/src/Filters/Rules/Person/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RegExpName.py b/src/Filters/Rules/Person/_RegExpName.py index c679c2799..5a0cde75a 100644 --- a/src/Filters/Rules/Person/_RegExpName.py +++ b/src/Filters/Rules/Person/_RegExpName.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RelationshipPathBetween.py b/src/Filters/Rules/Person/_RelationshipPathBetween.py index 0430919b5..d4c804497 100644 --- a/src/Filters/Rules/Person/_RelationshipPathBetween.py +++ b/src/Filters/Rules/Person/_RelationshipPathBetween.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py b/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py index 133ad4479..cafead0d8 100644 --- a/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py +++ b/src/Filters/Rules/Person/_RelationshipPathBetweenBookmarks.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ try: set() except NameError: diff --git a/src/Filters/Rules/Person/_SearchName.py b/src/Filters/Rules/Person/_SearchName.py index c4f2f027b..99e7b74eb 100644 --- a/src/Filters/Rules/Person/_SearchName.py +++ b/src/Filters/Rules/Person/_SearchName.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_AllPlaces.py b/src/Filters/Rules/Place/_AllPlaces.py index a763c2fdd..649a5afb6 100644 --- a/src/Filters/Rules/Place/_AllPlaces.py +++ b/src/Filters/Rules/Place/_AllPlaces.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_ChangedSince.py b/src/Filters/Rules/Place/_ChangedSince.py index c5a1a40d2..580dda2e2 100644 --- a/src/Filters/Rules/Place/_ChangedSince.py +++ b/src/Filters/Rules/Place/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasGallery.py b/src/Filters/Rules/Place/_HasGallery.py index 0eec8ad0d..89b35c9b5 100755 --- a/src/Filters/Rules/Place/_HasGallery.py +++ b/src/Filters/Rules/Place/_HasGallery.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasIdOf.py b/src/Filters/Rules/Place/_HasIdOf.py index 4637937d4..0b29b1bd3 100644 --- a/src/Filters/Rules/Place/_HasIdOf.py +++ b/src/Filters/Rules/Place/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNoLatOrLon.py b/src/Filters/Rules/Place/_HasNoLatOrLon.py index 501a0e8a0..e62416d41 100644 --- a/src/Filters/Rules/Place/_HasNoLatOrLon.py +++ b/src/Filters/Rules/Place/_HasNoLatOrLon.py @@ -24,7 +24,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNote.py b/src/Filters/Rules/Place/_HasNote.py index 16a9f796c..214f9a594 100755 --- a/src/Filters/Rules/Place/_HasNote.py +++ b/src/Filters/Rules/Place/_HasNote.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py index 9605cad42..48d8c8467 100644 --- a/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Place/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasNoteRegexp.py b/src/Filters/Rules/Place/_HasNoteRegexp.py index 4c94ff4c7..15205f60d 100644 --- a/src/Filters/Rules/Place/_HasNoteRegexp.py +++ b/src/Filters/Rules/Place/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasPlace.py b/src/Filters/Rules/Place/_HasPlace.py index c94289ff9..6e7fc9c6b 100644 --- a/src/Filters/Rules/Place/_HasPlace.py +++ b/src/Filters/Rules/Place/_HasPlace.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_HasReferenceCountOf.py b/src/Filters/Rules/Place/_HasReferenceCountOf.py index e28b4367e..77f2c2179 100644 --- a/src/Filters/Rules/Place/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Place/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_InLatLonNeighborhood.py b/src/Filters/Rules/Place/_InLatLonNeighborhood.py index eccc0d451..6a1b9c9bd 100644 --- a/src/Filters/Rules/Place/_InLatLonNeighborhood.py +++ b/src/Filters/Rules/Place/_InLatLonNeighborhood.py @@ -24,7 +24,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_MatchesEventFilter.py b/src/Filters/Rules/Place/_MatchesEventFilter.py index 24391e4be..653371b31 100644 --- a/src/Filters/Rules/Place/_MatchesEventFilter.py +++ b/src/Filters/Rules/Place/_MatchesEventFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_MatchesFilter.py b/src/Filters/Rules/Place/_MatchesFilter.py index 20d853c19..689b59cf9 100644 --- a/src/Filters/Rules/Place/_MatchesFilter.py +++ b/src/Filters/Rules/Place/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_PlacePrivate.py b/src/Filters/Rules/Place/_PlacePrivate.py index 64394d095..032d6778d 100644 --- a/src/Filters/Rules/Place/_PlacePrivate.py +++ b/src/Filters/Rules/Place/_PlacePrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Place/_RegExpIdOf.py b/src/Filters/Rules/Place/_RegExpIdOf.py index 3993f23d2..cb2e99aec 100644 --- a/src/Filters/Rules/Place/_RegExpIdOf.py +++ b/src/Filters/Rules/Place/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_AllRepos.py b/src/Filters/Rules/Repository/_AllRepos.py index d1ce74471..b8ad3b5c0 100644 --- a/src/Filters/Rules/Repository/_AllRepos.py +++ b/src/Filters/Rules/Repository/_AllRepos.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_ChangedSince.py b/src/Filters/Rules/Repository/_ChangedSince.py index 2af5ba293..863bd2b74 100644 --- a/src/Filters/Rules/Repository/_ChangedSince.py +++ b/src/Filters/Rules/Repository/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasIdOf.py b/src/Filters/Rules/Repository/_HasIdOf.py index 14cd551fc..25d2b8974 100644 --- a/src/Filters/Rules/Repository/_HasIdOf.py +++ b/src/Filters/Rules/Repository/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py index 6d138fe64..17d009efd 100644 --- a/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Repository/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasNoteRegexp.py b/src/Filters/Rules/Repository/_HasNoteRegexp.py index 1ec2829c0..a109e245a 100644 --- a/src/Filters/Rules/Repository/_HasNoteRegexp.py +++ b/src/Filters/Rules/Repository/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasReferenceCountOf.py b/src/Filters/Rules/Repository/_HasReferenceCountOf.py index b1b3834d7..99c6aa6a5 100644 --- a/src/Filters/Rules/Repository/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Repository/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_HasRepo.py b/src/Filters/Rules/Repository/_HasRepo.py index ebe5afb83..8ea507e3d 100644 --- a/src/Filters/Rules/Repository/_HasRepo.py +++ b/src/Filters/Rules/Repository/_HasRepo.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_MatchesFilter.py b/src/Filters/Rules/Repository/_MatchesFilter.py index 23d3fd0fa..b444859f7 100644 --- a/src/Filters/Rules/Repository/_MatchesFilter.py +++ b/src/Filters/Rules/Repository/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_RegExpIdOf.py b/src/Filters/Rules/Repository/_RegExpIdOf.py index 8bdcab118..b5463584c 100644 --- a/src/Filters/Rules/Repository/_RegExpIdOf.py +++ b/src/Filters/Rules/Repository/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Repository/_RepoPrivate.py b/src/Filters/Rules/Repository/_RepoPrivate.py index 1b31aa832..bbf10607c 100644 --- a/src/Filters/Rules/Repository/_RepoPrivate.py +++ b/src/Filters/Rules/Repository/_RepoPrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_AllSources.py b/src/Filters/Rules/Source/_AllSources.py index 101628bb3..efed78682 100644 --- a/src/Filters/Rules/Source/_AllSources.py +++ b/src/Filters/Rules/Source/_AllSources.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_ChangedSince.py b/src/Filters/Rules/Source/_ChangedSince.py index 540b01e36..ba1a62b69 100644 --- a/src/Filters/Rules/Source/_ChangedSince.py +++ b/src/Filters/Rules/Source/_ChangedSince.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasGallery.py b/src/Filters/Rules/Source/_HasGallery.py index 2ba24fb38..c74361b5d 100755 --- a/src/Filters/Rules/Source/_HasGallery.py +++ b/src/Filters/Rules/Source/_HasGallery.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasIdOf.py b/src/Filters/Rules/Source/_HasIdOf.py index 91e08980c..75823cf75 100644 --- a/src/Filters/Rules/Source/_HasIdOf.py +++ b/src/Filters/Rules/Source/_HasIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasNote.py b/src/Filters/Rules/Source/_HasNote.py index 1119ddf02..e8a1f947e 100755 --- a/src/Filters/Rules/Source/_HasNote.py +++ b/src/Filters/Rules/Source/_HasNote.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py index ee860c75f..280d016fb 100644 --- a/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py +++ b/src/Filters/Rules/Source/_HasNoteMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasNoteRegexp.py b/src/Filters/Rules/Source/_HasNoteRegexp.py index cd2debb53..5a98372b9 100644 --- a/src/Filters/Rules/Source/_HasNoteRegexp.py +++ b/src/Filters/Rules/Source/_HasNoteRegexp.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasReferenceCountOf.py b/src/Filters/Rules/Source/_HasReferenceCountOf.py index a6bba6e5a..bdd907359 100644 --- a/src/Filters/Rules/Source/_HasReferenceCountOf.py +++ b/src/Filters/Rules/Source/_HasReferenceCountOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasRepository.py b/src/Filters/Rules/Source/_HasRepository.py index e6cac23e7..e8b06de11 100644 --- a/src/Filters/Rules/Source/_HasRepository.py +++ b/src/Filters/Rules/Source/_HasRepository.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_HasSource.py b/src/Filters/Rules/Source/_HasSource.py index aba51bbca..5a12e341f 100644 --- a/src/Filters/Rules/Source/_HasSource.py +++ b/src/Filters/Rules/Source/_HasSource.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_MatchesFilter.py b/src/Filters/Rules/Source/_MatchesFilter.py index 530df627f..b07ee8233 100644 --- a/src/Filters/Rules/Source/_MatchesFilter.py +++ b/src/Filters/Rules/Source/_MatchesFilter.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_RegExpIdOf.py b/src/Filters/Rules/Source/_RegExpIdOf.py index 8abe613bd..22563d8ec 100644 --- a/src/Filters/Rules/Source/_RegExpIdOf.py +++ b/src/Filters/Rules/Source/_RegExpIdOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/Source/_SourcePrivate.py b/src/Filters/Rules/Source/_SourcePrivate.py index 164aed867..81ef0895f 100644 --- a/src/Filters/Rules/Source/_SourcePrivate.py +++ b/src/Filters/Rules/Source/_SourcePrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_ChangedSinceBase.py b/src/Filters/Rules/_ChangedSinceBase.py index 080f2148e..5dd10546b 100644 --- a/src/Filters/Rules/_ChangedSinceBase.py +++ b/src/Filters/Rules/_ChangedSinceBase.py @@ -3,7 +3,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import re import time diff --git a/src/Filters/Rules/_Everything.py b/src/Filters/Rules/_Everything.py index c47d51267..155abe1e2 100644 --- a/src/Filters/Rules/_Everything.py +++ b/src/Filters/Rules/_Everything.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasAttributeBase.py b/src/Filters/Rules/_HasAttributeBase.py index b0866df86..51893d0a0 100644 --- a/src/Filters/Rules/_HasAttributeBase.py +++ b/src/Filters/Rules/_HasAttributeBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasEventBase.py b/src/Filters/Rules/_HasEventBase.py index 3c6dd760a..b00d59073 100644 --- a/src/Filters/Rules/_HasEventBase.py +++ b/src/Filters/Rules/_HasEventBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasGalleryBase.py b/src/Filters/Rules/_HasGalleryBase.py index db1701cd1..dbdc52982 100755 --- a/src/Filters/Rules/_HasGalleryBase.py +++ b/src/Filters/Rules/_HasGalleryBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasGrampsId.py b/src/Filters/Rules/_HasGrampsId.py index e2af8f4fe..78ea95e30 100644 --- a/src/Filters/Rules/_HasGrampsId.py +++ b/src/Filters/Rules/_HasGrampsId.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasLDSBase.py b/src/Filters/Rules/_HasLDSBase.py index a2aa3e77e..99a064453 100755 --- a/src/Filters/Rules/_HasLDSBase.py +++ b/src/Filters/Rules/_HasLDSBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasMarkerBase.py b/src/Filters/Rules/_HasMarkerBase.py index e836868d1..4e2eddf73 100644 --- a/src/Filters/Rules/_HasMarkerBase.py +++ b/src/Filters/Rules/_HasMarkerBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasNoteBase.py b/src/Filters/Rules/_HasNoteBase.py index 8ec781beb..b09b5a25b 100755 --- a/src/Filters/Rules/_HasNoteBase.py +++ b/src/Filters/Rules/_HasNoteBase.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasNoteRegexBase.py b/src/Filters/Rules/_HasNoteRegexBase.py index f6ba07800..9e5fa958f 100644 --- a/src/Filters/Rules/_HasNoteRegexBase.py +++ b/src/Filters/Rules/_HasNoteRegexBase.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import re -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasNoteSubstrBase.py b/src/Filters/Rules/_HasNoteSubstrBase.py index 5bd7acadd..8fd890dc8 100644 --- a/src/Filters/Rules/_HasNoteSubstrBase.py +++ b/src/Filters/Rules/_HasNoteSubstrBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasReferenceCountBase.py b/src/Filters/Rules/_HasReferenceCountBase.py index 2e28d7998..1553dc747 100644 --- a/src/Filters/Rules/_HasReferenceCountBase.py +++ b/src/Filters/Rules/_HasReferenceCountBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasSourceBase.py b/src/Filters/Rules/_HasSourceBase.py index b666f2cc9..46825ccb1 100755 --- a/src/Filters/Rules/_HasSourceBase.py +++ b/src/Filters/Rules/_HasSourceBase.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_HasTextMatchingSubstringOf.py b/src/Filters/Rules/_HasTextMatchingSubstringOf.py index 4b6bdb9dd..c34eabafb 100644 --- a/src/Filters/Rules/_HasTextMatchingSubstringOf.py +++ b/src/Filters/Rules/_HasTextMatchingSubstringOf.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_IsPrivate.py b/src/Filters/Rules/_IsPrivate.py index f09e203bc..345fe5c6a 100644 --- a/src/Filters/Rules/_IsPrivate.py +++ b/src/Filters/Rules/_IsPrivate.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_MatchesFilterBase.py b/src/Filters/Rules/_MatchesFilterBase.py index afbb3aafa..a112d75ad 100644 --- a/src/Filters/Rules/_MatchesFilterBase.py +++ b/src/Filters/Rules/_MatchesFilterBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/Rules/_RegExpIdBase.py b/src/Filters/Rules/_RegExpIdBase.py index 4c0dbe20d..9156dc7bf 100644 --- a/src/Filters/Rules/_RegExpIdBase.py +++ b/src/Filters/Rules/_RegExpIdBase.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import re #------------------------------------------------------------------------- diff --git a/src/Filters/Rules/_Rule.py b/src/Filters/Rules/_Rule.py index 176dfcb33..5c8d42d12 100644 --- a/src/Filters/Rules/_Rule.py +++ b/src/Filters/Rules/_Rule.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_EventSidebarFilter.py b/src/Filters/SideBar/_EventSidebarFilter.py index 81a1c7957..4ac1f771d 100644 --- a/src/Filters/SideBar/_EventSidebarFilter.py +++ b/src/Filters/SideBar/_EventSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_FamilySidebarFilter.py b/src/Filters/SideBar/_FamilySidebarFilter.py index 91ff34e57..c4f10c0d9 100644 --- a/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/src/Filters/SideBar/_FamilySidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_MediaSidebarFilter.py b/src/Filters/SideBar/_MediaSidebarFilter.py index e4179c541..1fc18c7f6 100644 --- a/src/Filters/SideBar/_MediaSidebarFilter.py +++ b/src/Filters/SideBar/_MediaSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_NoteSidebarFilter.py b/src/Filters/SideBar/_NoteSidebarFilter.py index e348a4605..d1c39f272 100644 --- a/src/Filters/SideBar/_NoteSidebarFilter.py +++ b/src/Filters/SideBar/_NoteSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_PersonSidebarFilter.py b/src/Filters/SideBar/_PersonSidebarFilter.py index d9769b054..ecbfd613a 100644 --- a/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/src/Filters/SideBar/_PersonSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_PlaceSidebarFilter.py b/src/Filters/SideBar/_PlaceSidebarFilter.py index e9c1a7cac..566b75370 100644 --- a/src/Filters/SideBar/_PlaceSidebarFilter.py +++ b/src/Filters/SideBar/_PlaceSidebarFilter.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_RepoSidebarFilter.py b/src/Filters/SideBar/_RepoSidebarFilter.py index 9c31713d5..d2f77d35f 100644 --- a/src/Filters/SideBar/_RepoSidebarFilter.py +++ b/src/Filters/SideBar/_RepoSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/SideBar/_SidebarFilter.py b/src/Filters/SideBar/_SidebarFilter.py index 1d2f0ed3a..8acc3d3ea 100644 --- a/src/Filters/SideBar/_SidebarFilter.py +++ b/src/Filters/SideBar/_SidebarFilter.py @@ -20,7 +20,7 @@ # $Id$ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk import pango diff --git a/src/Filters/SideBar/_SourceSidebarFilter.py b/src/Filters/SideBar/_SourceSidebarFilter.py index c80097325..9aece9e2f 100644 --- a/src/Filters/SideBar/_SourceSidebarFilter.py +++ b/src/Filters/SideBar/_SourceSidebarFilter.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/_FilterParser.py b/src/Filters/_FilterParser.py index f4ae79efb..25ddc4300 100644 --- a/src/Filters/_FilterParser.py +++ b/src/Filters/_FilterParser.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- from xml.sax import handler -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/_FilterStore.py b/src/Filters/_FilterStore.py index 2b17e00dd..80e05a52f 100644 --- a/src/Filters/_FilterStore.py +++ b/src/Filters/_FilterStore.py @@ -30,7 +30,7 @@ Package providing filtering framework for GRAMPS. # #------------------------------------------------------------------------- import gtk -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Filters/_SearchBar.py b/src/Filters/_SearchBar.py index fe7f997a6..fbbce28e6 100644 --- a/src/Filters/_SearchBar.py +++ b/src/Filters/_SearchBar.py @@ -31,7 +31,7 @@ Package providing filtering framework for GRAMPS. # #------------------------------------------------------------------------- import gtk -from gettext import gettext as _ +from gen.ggettext import gettext as _ _RETURN = gtk.gdk.keyval_from_name("Return") _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter") diff --git a/src/GrampsAboutDialog.py b/src/GrampsAboutDialog.py index dbb371c13..2d95800e6 100644 --- a/src/GrampsAboutDialog.py +++ b/src/GrampsAboutDialog.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import sys import bsddb diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index b74a5fd06..308f9dcbe 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------- import random -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os from xml.sax.saxutils import escape diff --git a/src/GrampsLogger/_ErrorReportAssistant.py b/src/GrampsLogger/_ErrorReportAssistant.py index d84878a7e..8e3d242d5 100644 --- a/src/GrampsLogger/_ErrorReportAssistant.py +++ b/src/GrampsLogger/_ErrorReportAssistant.py @@ -1,4 +1,4 @@ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import Assistant import const import gtk diff --git a/src/GrampsLogger/_ErrorView.py b/src/GrampsLogger/_ErrorView.py index 4fb7a694f..5fc3182c7 100644 --- a/src/GrampsLogger/_ErrorView.py +++ b/src/GrampsLogger/_ErrorView.py @@ -11,7 +11,7 @@ import gtk # #------------------------------------------------------------------------- import const -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from _ErrorReportAssistant import ErrorReportAssistant import GrampsDisplay diff --git a/src/LdsUtils.py b/src/LdsUtils.py index 180f95f2a..971897ae7 100644 --- a/src/LdsUtils.py +++ b/src/LdsUtils.py @@ -29,7 +29,7 @@ import os import logging from xml.parsers.expat import ParserCreate -from gettext import gettext as _ +from gen.ggettext import gettext as _ LOG = logging.getLogger(".") diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index c7bf4d332..af353608d 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -33,7 +33,7 @@ import pango # GRAMPS modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import gen.lib from ReportBase import ReportUtils from gen.display.name import displayer as name_displayer diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py index 8e539ea50..dbb84bd43 100644 --- a/src/Merge/_MergePlace.py +++ b/src/Merge/_MergePlace.py @@ -40,7 +40,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import const import GrampsDisplay import ManagedWindow diff --git a/src/Merge/_MergeSource.py b/src/Merge/_MergeSource.py index f45ff4dbc..ec567aaaf 100644 --- a/src/Merge/_MergeSource.py +++ b/src/Merge/_MergeSource.py @@ -38,7 +38,7 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import const import GrampsDisplay import ManagedWindow diff --git a/src/Mime/_GnomeMime.py b/src/Mime/_GnomeMime.py index 35e3482f3..2bf995b38 100644 --- a/src/Mime/_GnomeMime.py +++ b/src/Mime/_GnomeMime.py @@ -30,7 +30,7 @@ except: from gnome.vfs import mime_get_short_list_applications, \ mime_get_description, get_mime_type, mime_get_default_application -from gettext import gettext as _ +from gen.ggettext import gettext as _ def get_application(type): """Return the application command and application name of the diff --git a/src/Mime/_PythonMime.py b/src/Mime/_PythonMime.py index f89410f5e..03ed38b6f 100644 --- a/src/Mime/_PythonMime.py +++ b/src/Mime/_PythonMime.py @@ -20,7 +20,7 @@ import mimetypes import const -from gettext import gettext as _ +from gen.ggettext import gettext as _ _type_map = { 'application/x-gramps' : 'Gramps database', diff --git a/src/Mime/_WinMime.py b/src/Mime/_WinMime.py index 4b2431a23..1caf3dbe9 100644 --- a/src/Mime/_WinMime.py +++ b/src/Mime/_WinMime.py @@ -31,7 +31,7 @@ Mime utility functions for the MS Windows platform #------------------------------------------------------------------------- import os from _winreg import * -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/PlaceUtils.py b/src/PlaceUtils.py index 45e247648..16ea89b64 100644 --- a/src/PlaceUtils.py +++ b/src/PlaceUtils.py @@ -29,7 +29,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import math #------------------------------------------------------------------------- diff --git a/src/PluginUtils/_GuiOptions.py b/src/PluginUtils/_GuiOptions.py index f4b9e4ada..53e088133 100644 --- a/src/PluginUtils/_GuiOptions.py +++ b/src/PluginUtils/_GuiOptions.py @@ -30,7 +30,7 @@ Specific option handling for a GUI. # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import sys diff --git a/src/PluginUtils/_PluginDialogs.py b/src/PluginUtils/_PluginDialogs.py index 282c865bc..432fe0243 100644 --- a/src/PluginUtils/_PluginDialogs.py +++ b/src/PluginUtils/_PluginDialogs.py @@ -32,7 +32,7 @@ import gtk # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ from collections import defaultdict #------------------------------------------------------------------------- diff --git a/src/PluginUtils/_PluginWindows.py b/src/PluginUtils/_PluginWindows.py index 78a71dd42..5e92cb3d3 100644 --- a/src/PluginUtils/_PluginWindows.py +++ b/src/PluginUtils/_PluginWindows.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------- import traceback -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/PluginUtils/_Tool.py b/src/PluginUtils/_Tool.py index 6e44edd3a..98f8b990e 100644 --- a/src/PluginUtils/_Tool.py +++ b/src/PluginUtils/_Tool.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- from types import ClassType, InstanceType -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py index 3d0010a66..7c1f22cb2 100644 --- a/src/QuestionDialog.py +++ b/src/QuestionDialog.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/QuickReports.py b/src/QuickReports.py index 33025b9c1..d24fa2f51 100644 --- a/src/QuickReports.py +++ b/src/QuickReports.py @@ -30,7 +30,7 @@ This module provides the functions to build the quick report context menu's # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ from cStringIO import StringIO #------------------------------------------------------------------------ diff --git a/src/Relationship.py b/src/Relationship.py index 5591b8769..87811b1be 100644 --- a/src/Relationship.py +++ b/src/Relationship.py @@ -36,7 +36,7 @@ import os #------------------------------------------------------------------------- import gen.lib -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from gen.plug import PluginRegister, BasePluginManager #------------------------------------------------------------------------- diff --git a/src/Reorder.py b/src/Reorder.py index 86f4aab7c..c34165c4c 100644 --- a/src/Reorder.py +++ b/src/Reorder.py @@ -22,7 +22,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/ReportBase/_CommandLineReport.py b/src/ReportBase/_CommandLineReport.py index 5bcfe3f92..afe7f8b84 100644 --- a/src/ReportBase/_CommandLineReport.py +++ b/src/ReportBase/_CommandLineReport.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import traceback import os import sys diff --git a/src/ReportBase/_Constants.py b/src/ReportBase/_Constants.py index aa8822de2..30e450271 100644 --- a/src/ReportBase/_Constants.py +++ b/src/ReportBase/_Constants.py @@ -27,7 +27,7 @@ # standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/ReportBase/_DocReportDialog.py b/src/ReportBase/_DocReportDialog.py index 388f98a0a..e2fb18e82 100644 --- a/src/ReportBase/_DocReportDialog.py +++ b/src/ReportBase/_DocReportDialog.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/ReportBase/_Endnotes.py b/src/ReportBase/_Endnotes.py index a5a522af5..10fdb3c99 100644 --- a/src/ReportBase/_Endnotes.py +++ b/src/ReportBase/_Endnotes.py @@ -24,7 +24,7 @@ Provide utilities for printing endnotes in text reports. """ from gen.plug.docgen import FontStyle, ParagraphStyle, FONT_SANS_SERIF -from gettext import gettext as _ +from gen.ggettext import gettext as _ def add_endnote_styles(style_sheet): """ diff --git a/src/ReportBase/_GraphvizReportDialog.py b/src/ReportBase/_GraphvizReportDialog.py index accd8faea..0559a62fd 100644 --- a/src/ReportBase/_GraphvizReportDialog.py +++ b/src/ReportBase/_GraphvizReportDialog.py @@ -33,7 +33,7 @@ import tempfile import threading import time from types import ClassType, InstanceType -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------------- # diff --git a/src/ReportBase/_PaperMenu.py b/src/ReportBase/_PaperMenu.py index 4da25295a..34f5527fc 100644 --- a/src/ReportBase/_PaperMenu.py +++ b/src/ReportBase/_PaperMenu.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/ReportBase/_ReportDialog.py b/src/ReportBase/_ReportDialog.py index 3ba312c99..e76d5ce1e 100644 --- a/src/ReportBase/_ReportDialog.py +++ b/src/ReportBase/_ReportDialog.py @@ -28,7 +28,7 @@ #------------------------------------------------------------------------- import os from types import ClassType -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".") diff --git a/src/ReportBase/_ReportUtils.py b/src/ReportBase/_ReportUtils.py index 7ae401ced..a7ba641b4 100644 --- a/src/ReportBase/_ReportUtils.py +++ b/src/ReportBase/_ReportUtils.py @@ -33,7 +33,7 @@ A collection of utilities to aid in the generation of reports. # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/ReportBase/_StyleComboBox.py b/src/ReportBase/_StyleComboBox.py index c88fca3bc..2c1cbf264 100644 --- a/src/ReportBase/_StyleComboBox.py +++ b/src/ReportBase/_StyleComboBox.py @@ -20,7 +20,7 @@ # $Id$ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk import gobject diff --git a/src/ReportBase/_StyleEditor.py b/src/ReportBase/_StyleEditor.py index 638ac3293..5b8cee878 100644 --- a/src/ReportBase/_StyleEditor.py +++ b/src/ReportBase/_StyleEditor.py @@ -31,7 +31,7 @@ Paragraph/Font style editor # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import logging log = logging.getLogger(".") diff --git a/src/ScratchPad.py b/src/ScratchPad.py index 292207890..a949ce373 100644 --- a/src/ScratchPad.py +++ b/src/ScratchPad.py @@ -50,7 +50,7 @@ import TreeTips import DateHandler import GrampsDisplay import ManagedWindow -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from Utils import mac from glade import Glade from DdTargets import DdTargets diff --git a/src/Simple/_SimpleTable.py b/src/Simple/_SimpleTable.py index aedf8c451..2ea093e3d 100644 --- a/src/Simple/_SimpleTable.py +++ b/src/Simple/_SimpleTable.py @@ -25,7 +25,7 @@ Provide a simplified table creation interface import cgi import copy -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gen.lib import Errors diff --git a/src/Spell.py b/src/Spell.py index 6bdac1260..7110de640 100644 --- a/src/Spell.py +++ b/src/Spell.py @@ -32,7 +32,7 @@ present, we default to no spell checking. # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import locale #------------------------------------------------------------------------- diff --git a/src/TipOfDay.py b/src/TipOfDay.py index 8988e8a90..58225fcc3 100644 --- a/src/TipOfDay.py +++ b/src/TipOfDay.py @@ -31,7 +31,7 @@ Handles the Tip of the Day dialog #------------------------------------------------------------------------- from xml.parsers.expat import ParserCreate,ExpatError from random import Random -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/ToolTips.py b/src/ToolTips.py index ca3470549..53026c7a3 100644 --- a/src/ToolTips.py +++ b/src/ToolTips.py @@ -51,7 +51,7 @@ # #------------------------------------------------------------------------ from xml.sax.saxutils import escape -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/TransUtils.py b/src/TransUtils.py index ac05ba520..add5d921f 100644 --- a/src/TransUtils.py +++ b/src/TransUtils.py @@ -30,7 +30,7 @@ Provide translation assistance # python modules # #------------------------------------------------------------------------ -import gettext as translate +import gettext import sys import os @@ -67,8 +67,8 @@ def setup_gettext(): :returns: Nothing. """ - translate.bindtextdomain(LOCALEDOMAIN, LOCALEDIR) - translate.textdomain(LOCALEDOMAIN) + gettext.bindtextdomain(LOCALEDOMAIN, LOCALEDIR) + gettext.textdomain(LOCALEDOMAIN) #following installs _ as a python function, we avoid this as TransUtils is #used sometimes: @@ -106,10 +106,10 @@ def get_addon_translator(filename=None, domain="addon"): """ if filename is None: filename = sys._getframe(1).f_code.co_filename - gramps_translator = translate.translation(LOCALEDOMAIN, LOCALEDIR, + gramps_translator = gettext.translation(LOCALEDOMAIN, LOCALEDIR, fallback=True) path = os.path.dirname(os.path.abspath(filename)) - addon_translator = translate.translation(domain, os.path.join(path,"locale"), + addon_translator = gettext.translation(domain, os.path.join(path,"locale"), fallback=True) gramps_translator.add_fallback(addon_translator) return gramps_translator # with a language fallback @@ -133,64 +133,3 @@ def get_available_translations(): languages.sort() return languages - -def gettext(msgid): - """ - Obtain translation of gettext, return a unicode object - :param msgid: The string to translated. - :type msgid: unicode - :returns: Translation or the original with context stripped. - :rtype: unicode - """ - return unicode(translate.gettext(msgid)) - -def sgettext(msgid, sep='|'): - """ - Strip the context used for resolving translation ambiguities. - - The translation of msgid is returned unless the translation is - not available and the msgid contains the separator. In that case, - the returned value is the portion of msgid following the last - separator. Default separator is '|'. - - :param msgid: The string to translated. - :type msgid: unicode - :param sep: The separator marking the context. - :type sep: unicode - :returns: Translation or the original with context stripped. - :rtype: unicode - - """ - msgval = translate.gettext(msgid) - if msgval == msgid: - sep_idx = msgid.rfind(sep) - msgval = msgid[sep_idx+1:] - return unicode(msgval) - -def sngettext(singular, plural, n, sep='|'): - """ - Strip the context used for resolving translation ambiguities. - - The translation of singular/plural is returned unless the translation is - not available and the singular contains the separator. In that case, - the returned value is the portion of singular following the last - separator. Default separator is '|'. - - :param singular: The singular form of the string to be translated. - may contain a context seperator - :type singular: unicode - :param plural: The plural form of the string to be translated. - :type plural: unicode - :param n: the amount for which to decide the translation - :type n: int - :param sep: The separator marking the context. - :type sep: unicode - :returns: Translation or the original with context stripped. - :rtype: unicode - - """ - msgval = translate.ngettext(singular, plural, n) - if msgval == singular: - sep_idx = singular.rfind(sep) - msgval = singular[sep_idx+1:] - return unicode(msgval) diff --git a/src/UndoHistory.py b/src/UndoHistory.py index b52f19ee4..9c8c15ea4 100644 --- a/src/UndoHistory.py +++ b/src/UndoHistory.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import time -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Utils.py b/src/Utils.py index b1a76d45a..eea2a387f 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -50,7 +50,7 @@ import Errors from GrampsLocale import codeset from const import TEMP_DIR, USER_HOME, WINDOWS, MACOS, LINUX, GRAMPS_UUID -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/cli/arghandler.py b/src/cli/arghandler.py index f7283d017..b0bdd0c00 100644 --- a/src/cli/arghandler.py +++ b/src/cli/arghandler.py @@ -35,7 +35,7 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import os import sys -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/cli/argparser.py b/src/cli/argparser.py index ebbfeaee7..1dc892e9c 100644 --- a/src/cli/argparser.py +++ b/src/cli/argparser.py @@ -35,7 +35,7 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import sys import getopt -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging #------------------------------------------------------------------------- diff --git a/src/cli/clidbman.py b/src/cli/clidbman.py index ec093f27c..bb23dcf23 100644 --- a/src/cli/clidbman.py +++ b/src/cli/clidbman.py @@ -34,7 +34,7 @@ creating, and deleting of databases. #------------------------------------------------------------------------- import os import time -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # set up logging diff --git a/src/cli/grampscli.py b/src/cli/grampscli.py index ad4e2beb9..810041cec 100644 --- a/src/cli/grampscli.py +++ b/src/cli/grampscli.py @@ -33,7 +33,7 @@ Provides also two small base classes: CLIDbLoader, CLIManager # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import sys diff --git a/src/config.py b/src/config.py index 5929e5291..a2eca8c09 100644 --- a/src/config.py +++ b/src/config.py @@ -33,7 +33,7 @@ This package implements access to GRAMPS configuration. # #--------------------------------------------------------------- import os, sys -from gettext import gettext as _ +from gen.ggettext import gettext as _ #--------------------------------------------------------------- # diff --git a/src/docgen/ODSTab.py b/src/docgen/ODSTab.py index d6309292d..64bcbe652 100644 --- a/src/docgen/ODSTab.py +++ b/src/docgen/ODSTab.py @@ -28,7 +28,7 @@ import os import tempfile import zipfile -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/docgen/TextBufDoc.py b/src/docgen/TextBufDoc.py index 6aa8ffeb5..1297314c6 100644 --- a/src/docgen/TextBufDoc.py +++ b/src/docgen/TextBufDoc.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk import pango diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am index 128928893..83e3f154f 100644 --- a/src/gen/Makefile.am +++ b/src/gen/Makefile.am @@ -15,6 +15,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen pkgdata_PYTHON = \ __init__.py \ + ggettext.py \ updatecallback.py pkgpyexecdir = @pkgpyexecdir@/gen diff --git a/src/gen/db/base.py b/src/gen/db/base.py index 6189081a4..f981fe376 100644 --- a/src/gen/db/base.py +++ b/src/gen/db/base.py @@ -30,7 +30,7 @@ from this class. # Python libraries # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/db/exceptions.py b/src/gen/db/exceptions.py index ea71cda3b..08bc92e87 100644 --- a/src/gen/db/exceptions.py +++ b/src/gen/db/exceptions.py @@ -27,7 +27,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ class DbException(Exception): diff --git a/src/gen/db/read.py b/src/gen/db/read.py index 5b09c4531..ffef1eaf5 100644 --- a/src/gen/db/read.py +++ b/src/gen/db/read.py @@ -36,7 +36,7 @@ import locale import os from sys import maxint from bsddb import db -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging diff --git a/src/gen/db/undoredo.py b/src/gen/db/undoredo.py index 5f37cbdb2..203af9857 100644 --- a/src/gen/db/undoredo.py +++ b/src/gen/db/undoredo.py @@ -34,7 +34,7 @@ from __future__ import with_statement import time, os import cPickle as pickle from bsddb import db -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/db/write.py b/src/gen/db/write.py index 7517bc050..36f0f59f9 100644 --- a/src/gen/db/write.py +++ b/src/gen/db/write.py @@ -38,7 +38,7 @@ import locale import bisect from functools import wraps -from gettext import gettext as _ +from gen.ggettext import gettext as _ from bsddb import dbshelve, db import logging from sys import maxint diff --git a/src/gen/display/name.py b/src/gen/display/name.py index 8cbf3cf06..c54dc6899 100644 --- a/src/gen/display/name.py +++ b/src/gen/display/name.py @@ -30,7 +30,7 @@ Class handling language-specific displaying of names. # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import re #------------------------------------------------------------------------- diff --git a/src/gen/ggettext.py b/src/gen/ggettext.py new file mode 100644 index 000000000..c3f3d471f --- /dev/null +++ b/src/gen/ggettext.py @@ -0,0 +1,85 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2000-2006 Donald N. Allingham +# Copyright (C) 2009-2010 Brian G. Matherly +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id$ + +""" +This module ("Gramps Gettext") is an extension to the Python gettext module. +""" + +#------------------------------------------------------------------------ +# +# python modules +# +#------------------------------------------------------------------------ +import gettext as pgettext + + +def gettext(msgid): + """ + Obtain translation of gettext, return a unicode object + :param msgid: The string to translated. + :type msgid: unicode + :returns: Translation or the original. + :rtype: unicode + """ + return unicode(pgettext.gettext(msgid)) + +def ngettext(singular, plural, n): + """ + The translation of singular/plural is returned unless the translation is + not available and the singular contains the separator. In that case, + the returned value is the singular. + + :param singular: The singular form of the string to be translated. + may contain a context seperator + :type singular: unicode + :param plural: The plural form of the string to be translated. + :type plural: unicode + :param n: the amount for which to decide the translation + :type n: int + :returns: Translation or the original. + :rtype: unicode + """ + return unicode(pgettext.ngettext(singular, plural, n)) + +def sgettext(msgid, sep='|'): + """ + Strip the context used for resolving translation ambiguities. + + The translation of msgid is returned unless the translation is + not available and the msgid contains the separator. In that case, + the returned value is the portion of msgid following the last + separator. Default separator is '|'. + + :param msgid: The string to translated. + :type msgid: unicode + :param sep: The separator marking the context. + :type sep: unicode + :returns: Translation or the original with context stripped. + :rtype: unicode + + """ + msgval = pgettext.gettext(msgid) + if msgval == msgid: + sep_idx = msgid.rfind(sep) + msgval = msgid[sep_idx+1:] + return unicode(msgval) \ No newline at end of file diff --git a/src/gen/lib/attrtype.py b/src/gen/lib/attrtype.py index 691f645b4..2e348f20a 100644 --- a/src/gen/lib/attrtype.py +++ b/src/gen/lib/attrtype.py @@ -29,7 +29,7 @@ Provide the different Attribute Types for GRAMPS. # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/gen/lib/childreftype.py b/src/gen/lib/childreftype.py index 97f6d81ef..7e56c3a44 100644 --- a/src/gen/lib/childreftype.py +++ b/src/gen/lib/childreftype.py @@ -28,7 +28,7 @@ Provide the different child reference types. # standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/date.py b/src/gen/lib/date.py index 827fdffc4..0721c1194 100644 --- a/src/gen/lib/date.py +++ b/src/gen/lib/date.py @@ -28,8 +28,8 @@ # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext #------------------------------------------------------------------------ # diff --git a/src/gen/lib/eventroletype.py b/src/gen/lib/eventroletype.py index 9a9c67d67..b44a21b00 100644 --- a/src/gen/lib/eventroletype.py +++ b/src/gen/lib/eventroletype.py @@ -28,7 +28,7 @@ Provide the different event roles. # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/eventtype.py b/src/gen/lib/eventtype.py index 1018a97a7..6fc52ad28 100644 --- a/src/gen/lib/eventtype.py +++ b/src/gen/lib/eventtype.py @@ -29,7 +29,7 @@ Provide the different event types # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/familyreltype.py b/src/gen/lib/familyreltype.py index e8f4795f0..91c69bfbc 100644 --- a/src/gen/lib/familyreltype.py +++ b/src/gen/lib/familyreltype.py @@ -27,7 +27,7 @@ Provide the different family reference types. # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/grampstype.py b/src/gen/lib/grampstype.py index baad0d161..fa3cbf105 100644 --- a/src/gen/lib/grampstype.py +++ b/src/gen/lib/grampstype.py @@ -30,7 +30,7 @@ Base type for all gramps types. # Python modules # #------------------------------------------------------------------------ -from TransUtils import gettext as _ +from gen.ggettext import gettext as _ _UNKNOWN = _('Unknown') #------------------------------------------------------------------------- diff --git a/src/gen/lib/ldsord.py b/src/gen/lib/ldsord.py index 71c4bc8d3..7d045476b 100644 --- a/src/gen/lib/ldsord.py +++ b/src/gen/lib/ldsord.py @@ -29,7 +29,7 @@ LDS Ordinance class for GRAMPS. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ from warnings import warn #------------------------------------------------------------------------- diff --git a/src/gen/lib/markertype.py b/src/gen/lib/markertype.py index 157422169..89959f3f2 100644 --- a/src/gen/lib/markertype.py +++ b/src/gen/lib/markertype.py @@ -28,7 +28,7 @@ Marker types. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/nametype.py b/src/gen/lib/nametype.py index 63677d5c5..3a2a35945 100644 --- a/src/gen/lib/nametype.py +++ b/src/gen/lib/nametype.py @@ -29,7 +29,7 @@ Name types. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/notetype.py b/src/gen/lib/notetype.py index b8e7cb013..6e9974e43 100644 --- a/src/gen/lib/notetype.py +++ b/src/gen/lib/notetype.py @@ -29,7 +29,7 @@ Note types. # standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/repotype.py b/src/gen/lib/repotype.py index 332a098ad..54db1fd59 100644 --- a/src/gen/lib/repotype.py +++ b/src/gen/lib/repotype.py @@ -29,7 +29,7 @@ Repository types. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/srcmediatype.py b/src/gen/lib/srcmediatype.py index 3f85b8054..c4b2cb29f 100644 --- a/src/gen/lib/srcmediatype.py +++ b/src/gen/lib/srcmediatype.py @@ -28,7 +28,7 @@ SourceMedia types. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/styledtexttagtype.py b/src/gen/lib/styledtexttagtype.py index 1ec5bcec1..0c033c37b 100644 --- a/src/gen/lib/styledtexttagtype.py +++ b/src/gen/lib/styledtexttagtype.py @@ -27,7 +27,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/urltype.py b/src/gen/lib/urltype.py index e3e753962..b1ec37f03 100644 --- a/src/gen/lib/urltype.py +++ b/src/gen/lib/urltype.py @@ -29,7 +29,7 @@ URL types # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/plug/_gramplet.py b/src/gen/plug/_gramplet.py index 3ad84002c..bf8f2e36d 100644 --- a/src/gen/plug/_gramplet.py +++ b/src/gen/plug/_gramplet.py @@ -21,7 +21,7 @@ # $Id$ import types -from gettext import gettext as _ +from gen.ggettext import gettext as _ class Gramplet(object): """ diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py index 2fed565c5..471156e76 100644 --- a/src/gen/plug/_manager.py +++ b/src/gen/plug/_manager.py @@ -38,7 +38,7 @@ importers, exporters, quick reports, and document generators. import os import sys import re -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/plug/_pluginreg.py b/src/gen/plug/_pluginreg.py index 8e9790b8c..22713b0cf 100644 --- a/src/gen/plug/_pluginreg.py +++ b/src/gen/plug/_pluginreg.py @@ -33,7 +33,7 @@ import os import sys import re import traceback -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/plug/docbackend/docbackend.py b/src/gen/plug/docbackend/docbackend.py index 2bb841d0d..bc7fa5e94 100644 --- a/src/gen/plug/docbackend/docbackend.py +++ b/src/gen/plug/docbackend/docbackend.py @@ -28,7 +28,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/proxy/private.py b/src/gen/proxy/private.py index be9747671..02ca5c21a 100644 --- a/src/gen/proxy/private.py +++ b/src/gen/proxy/private.py @@ -29,7 +29,7 @@ Proxy class for the GRAMPS databases. Filter out all data marked private. # Python libraries # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/dbloader.py b/src/gui/dbloader.py index a893be7d8..5a65af2a7 100644 --- a/src/gui/dbloader.py +++ b/src/gui/dbloader.py @@ -31,7 +31,7 @@ Handling of loading new/existing databases. # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging #------------------------------------------------------------------------- diff --git a/src/gui/dbman.py b/src/gui/dbman.py index 83eb6c1cd..1a941006b 100644 --- a/src/gui/dbman.py +++ b/src/gui/dbman.py @@ -36,7 +36,7 @@ import os import time import copy import subprocess -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # # set up logging diff --git a/src/gui/editors/addmedia.py b/src/gui/editors/addmedia.py index 645c5d56a..d53ca5b65 100644 --- a/src/gui/editors/addmedia.py +++ b/src/gui/editors/addmedia.py @@ -36,7 +36,7 @@ import os # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/addrembedlist.py b/src/gui/editors/displaytabs/addrembedlist.py index a6a163737..fad75cca5 100644 --- a/src/gui/editors/displaytabs/addrembedlist.py +++ b/src/gui/editors/displaytabs/addrembedlist.py @@ -29,7 +29,7 @@ Address List display tab. # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/attrembedlist.py b/src/gui/editors/displaytabs/attrembedlist.py index 575cac37b..3f05351cf 100644 --- a/src/gui/editors/displaytabs/attrembedlist.py +++ b/src/gui/editors/displaytabs/attrembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/backreflist.py b/src/gui/editors/displaytabs/backreflist.py index 85bfc2f94..ec87a812c 100644 --- a/src/gui/editors/displaytabs/backreflist.py +++ b/src/gui/editors/displaytabs/backreflist.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/backrefmodel.py b/src/gui/editors/displaytabs/backrefmodel.py index 0870b32ba..fbeda1c25 100644 --- a/src/gui/editors/displaytabs/backrefmodel.py +++ b/src/gui/editors/displaytabs/backrefmodel.py @@ -28,7 +28,7 @@ import gobject import gtk -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/buttontab.py b/src/gui/editors/displaytabs/buttontab.py index 778ef1f76..24ee77518 100644 --- a/src/gui/editors/displaytabs/buttontab.py +++ b/src/gui/editors/displaytabs/buttontab.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/dataembedlist.py b/src/gui/editors/displaytabs/dataembedlist.py index 3a222645a..b47f6fbeb 100644 --- a/src/gui/editors/displaytabs/dataembedlist.py +++ b/src/gui/editors/displaytabs/dataembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/embeddedlist.py b/src/gui/editors/displaytabs/embeddedlist.py index e4a83dc68..221b095a6 100644 --- a/src/gui/editors/displaytabs/embeddedlist.py +++ b/src/gui/editors/displaytabs/embeddedlist.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import cPickle as pickle #------------------------------------------------------------------------- diff --git a/src/gui/editors/displaytabs/eventembedlist.py b/src/gui/editors/displaytabs/eventembedlist.py index 881b360be..30910cf10 100644 --- a/src/gui/editors/displaytabs/eventembedlist.py +++ b/src/gui/editors/displaytabs/eventembedlist.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk #------------------------------------------------------------------------- diff --git a/src/gui/editors/displaytabs/eventrefmodel.py b/src/gui/editors/displaytabs/eventrefmodel.py index 6432c6a27..d2cf8b1cd 100644 --- a/src/gui/editors/displaytabs/eventrefmodel.py +++ b/src/gui/editors/displaytabs/eventrefmodel.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/familyldsembedlist.py b/src/gui/editors/displaytabs/familyldsembedlist.py index 2c0c01860..ba6270d74 100644 --- a/src/gui/editors/displaytabs/familyldsembedlist.py +++ b/src/gui/editors/displaytabs/familyldsembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/gallerytab.py b/src/gui/editors/displaytabs/gallerytab.py index 66e0ddc5a..8da1df0da 100644 --- a/src/gui/editors/displaytabs/gallerytab.py +++ b/src/gui/editors/displaytabs/gallerytab.py @@ -26,7 +26,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import cPickle as pickle import urlparse diff --git a/src/gui/editors/displaytabs/ldsembedlist.py b/src/gui/editors/displaytabs/ldsembedlist.py index 3ead9071f..03493520f 100644 --- a/src/gui/editors/displaytabs/ldsembedlist.py +++ b/src/gui/editors/displaytabs/ldsembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/locationembedlist.py b/src/gui/editors/displaytabs/locationembedlist.py index 790f27a28..44d5af797 100644 --- a/src/gui/editors/displaytabs/locationembedlist.py +++ b/src/gui/editors/displaytabs/locationembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/nameembedlist.py b/src/gui/editors/displaytabs/nameembedlist.py index 9fbc54dc9..4111fa07d 100644 --- a/src/gui/editors/displaytabs/nameembedlist.py +++ b/src/gui/editors/displaytabs/nameembedlist.py @@ -33,7 +33,7 @@ import gtk # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/namemodel.py b/src/gui/editors/displaytabs/namemodel.py index 5bef1236c..37ff7a03f 100644 --- a/src/gui/editors/displaytabs/namemodel.py +++ b/src/gui/editors/displaytabs/namemodel.py @@ -26,7 +26,7 @@ # python libraries # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/notetab.py b/src/gui/editors/displaytabs/notetab.py index 08150c9c2..905b81df7 100644 --- a/src/gui/editors/displaytabs/notetab.py +++ b/src/gui/editors/displaytabs/notetab.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/personeventembedlist.py b/src/gui/editors/displaytabs/personeventembedlist.py index 076341529..eae708af3 100644 --- a/src/gui/editors/displaytabs/personeventembedlist.py +++ b/src/gui/editors/displaytabs/personeventembedlist.py @@ -26,7 +26,7 @@ # python # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/personrefembedlist.py b/src/gui/editors/displaytabs/personrefembedlist.py index 2acffbe04..e2f8ac695 100644 --- a/src/gui/editors/displaytabs/personrefembedlist.py +++ b/src/gui/editors/displaytabs/personrefembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/repoembedlist.py b/src/gui/editors/displaytabs/repoembedlist.py index 3123e01f9..005efc888 100644 --- a/src/gui/editors/displaytabs/repoembedlist.py +++ b/src/gui/editors/displaytabs/repoembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/sourceembedlist.py b/src/gui/editors/displaytabs/sourceembedlist.py index 453f2a610..b38842f4d 100644 --- a/src/gui/editors/displaytabs/sourceembedlist.py +++ b/src/gui/editors/displaytabs/sourceembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/displaytabs/webembedlist.py b/src/gui/editors/displaytabs/webembedlist.py index e78291540..9d4a377f9 100644 --- a/src/gui/editors/displaytabs/webembedlist.py +++ b/src/gui/editors/displaytabs/webembedlist.py @@ -25,7 +25,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk #------------------------------------------------------------------------- diff --git a/src/gui/editors/editaddress.py b/src/gui/editors/editaddress.py index 256d17ce2..39f607571 100644 --- a/src/gui/editors/editaddress.py +++ b/src/gui/editors/editaddress.py @@ -31,7 +31,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editattribute.py b/src/gui/editors/editattribute.py index 143d6c8fd..fc4f49b58 100644 --- a/src/gui/editors/editattribute.py +++ b/src/gui/editors/editattribute.py @@ -31,7 +31,7 @@ mechanism for the user to edit attribute information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editchildref.py b/src/gui/editors/editchildref.py index b9e9ec8c0..16ac9e126 100644 --- a/src/gui/editors/editchildref.py +++ b/src/gui/editors/editchildref.py @@ -31,7 +31,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editevent.py b/src/gui/editors/editevent.py index 90062b26e..d702f3553 100644 --- a/src/gui/editors/editevent.py +++ b/src/gui/editors/editevent.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editeventref.py b/src/gui/editors/editeventref.py index 08984bdb1..129272aab 100644 --- a/src/gui/editors/editeventref.py +++ b/src/gui/editors/editeventref.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py index 37c69a23d..fb392da7f 100644 --- a/src/gui/editors/editfamily.py +++ b/src/gui/editors/editfamily.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------- from bsddb import db as bsddb_db -from gettext import gettext as _ +from gen.ggettext import gettext as _ from DdTargets import DdTargets import cPickle as pickle diff --git a/src/gui/editors/editldsord.py b/src/gui/editors/editldsord.py index 37ff7e391..bf1ae5cbd 100644 --- a/src/gui/editors/editldsord.py +++ b/src/gui/editors/editldsord.py @@ -30,7 +30,7 @@ mechanism for the user to edit personal LDS information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editlocation.py b/src/gui/editors/editlocation.py index 54853ef70..4ef5c5c14 100644 --- a/src/gui/editors/editlocation.py +++ b/src/gui/editors/editlocation.py @@ -29,7 +29,7 @@ from editsecondary import EditSecondary from glade import Glade from gui.widgets import MonitoredEntry -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editmedia.py b/src/gui/editors/editmedia.py index ce1a7fb50..18c0f1af2 100644 --- a/src/gui/editors/editmedia.py +++ b/src/gui/editors/editmedia.py @@ -26,7 +26,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editmediaref.py b/src/gui/editors/editmediaref.py index 0482f247a..da153642f 100644 --- a/src/gui/editors/editmediaref.py +++ b/src/gui/editors/editmediaref.py @@ -27,7 +27,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py index 154f722bf..e6dd0f7c2 100644 --- a/src/gui/editors/editname.py +++ b/src/gui/editors/editname.py @@ -27,7 +27,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editnote.py b/src/gui/editors/editnote.py index e99582bb4..c93900509 100644 --- a/src/gui/editors/editnote.py +++ b/src/gui/editors/editnote.py @@ -27,7 +27,7 @@ # Python classes # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".gui.editors.EditNote") diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py index 3b5a01d3f..5fc06e032 100644 --- a/src/gui/editors/editperson.py +++ b/src/gui/editors/editperson.py @@ -32,7 +32,7 @@ to edit information about a particular Person. # #------------------------------------------------------------------------- import locale -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editpersonref.py b/src/gui/editors/editpersonref.py index ee774160f..25d7ef4f8 100644 --- a/src/gui/editors/editpersonref.py +++ b/src/gui/editors/editpersonref.py @@ -31,7 +31,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editplace.py b/src/gui/editors/editplace.py index 03ae9ce4e..ad89ac798 100644 --- a/src/gui/editors/editplace.py +++ b/src/gui/editors/editplace.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/gui/editors/editprimary.py b/src/gui/editors/editprimary.py index f5a677ec0..32318e55a 100644 --- a/src/gui/editors/editprimary.py +++ b/src/gui/editors/editprimary.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editreporef.py b/src/gui/editors/editreporef.py index f656c918a..fc1ca9979 100644 --- a/src/gui/editors/editreporef.py +++ b/src/gui/editors/editreporef.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editrepository.py b/src/gui/editors/editrepository.py index 99bb93d9a..7a5eed85d 100644 --- a/src/gui/editors/editrepository.py +++ b/src/gui/editors/editrepository.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editsource.py b/src/gui/editors/editsource.py index 9fbd5a66a..1ebd02708 100644 --- a/src/gui/editors/editsource.py +++ b/src/gui/editors/editsource.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/gui/editors/editsourceref.py b/src/gui/editors/editsourceref.py index 57db52ea1..531cda1f4 100644 --- a/src/gui/editors/editsourceref.py +++ b/src/gui/editors/editsourceref.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editurl.py b/src/gui/editors/editurl.py index f436bc4f1..5c6a97448 100644 --- a/src/gui/editors/editurl.py +++ b/src/gui/editors/editurl.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/editors/objectentries.py b/src/gui/editors/objectentries.py index 07905cd45..4f64fc968 100644 --- a/src/gui/editors/objectentries.py +++ b/src/gui/editors/objectentries.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import cPickle as pickle import logging diff --git a/src/gui/filtereditor.py b/src/gui/filtereditor.py index ca2e60e22..6c43a2441 100644 --- a/src/gui/filtereditor.py +++ b/src/gui/filtereditor.py @@ -60,7 +60,7 @@ from QuestionDialog import QuestionDialog import const import GrampsDisplay import Errors -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import gen.lib from Filters import Rules import AutoComp diff --git a/src/gui/grampsgui.py b/src/gui/grampsgui.py index 5fcdafc8c..b7e9a5087 100644 --- a/src/gui/grampsgui.py +++ b/src/gui/grampsgui.py @@ -29,7 +29,7 @@ import sys import os import const -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".grampsgui") diff --git a/src/gui/selectors/selectevent.py b/src/gui/selectors/selectevent.py index 10ad07125..4674ed181 100644 --- a/src/gui/selectors/selectevent.py +++ b/src/gui/selectors/selectevent.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectfamily.py b/src/gui/selectors/selectfamily.py index d1f32ce39..71b18a23e 100644 --- a/src/gui/selectors/selectfamily.py +++ b/src/gui/selectors/selectfamily.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectnote.py b/src/gui/selectors/selectnote.py index df930dcc1..66392e551 100644 --- a/src/gui/selectors/selectnote.py +++ b/src/gui/selectors/selectnote.py @@ -29,7 +29,7 @@ # Python Modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectobject.py b/src/gui/selectors/selectobject.py index bc89fb3fc..7426f1809 100644 --- a/src/gui/selectors/selectobject.py +++ b/src/gui/selectors/selectobject.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import gc -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectperson.py b/src/gui/selectors/selectperson.py index cd797e36c..c4303550d 100644 --- a/src/gui/selectors/selectperson.py +++ b/src/gui/selectors/selectperson.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gtk #------------------------------------------------------------------------- diff --git a/src/gui/selectors/selectplace.py b/src/gui/selectors/selectplace.py index 7ce4b6f53..1ccfdb840 100644 --- a/src/gui/selectors/selectplace.py +++ b/src/gui/selectors/selectplace.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectrepository.py b/src/gui/selectors/selectrepository.py index 2e71d6f22..90b994193 100644 --- a/src/gui/selectors/selectrepository.py +++ b/src/gui/selectors/selectrepository.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/selectors/selectsource.py b/src/gui/selectors/selectsource.py index dbb123aea..0d39738d7 100644 --- a/src/gui/selectors/selectsource.py +++ b/src/gui/selectors/selectsource.py @@ -26,7 +26,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/utils.py b/src/gui/utils.py index 9a7b99c9b..ea043e759 100644 --- a/src/gui/utils.py +++ b/src/gui/utils.py @@ -30,7 +30,7 @@ Utility functions that depend on GUI components or for GUI components # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ # gtk is not included here, because this file is currently imported # by code that needs to run without the DISPLAY variable (eg, in # the cli only). diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 3855963eb..a928fdb9c 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -33,7 +33,7 @@ Manages the main window and the pluggable views #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ from cStringIO import StringIO from collections import defaultdict diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index a3c3cbdb4..90af8fb17 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -60,7 +60,7 @@ import const import Utils from QuestionDialog import QuestionDialog, QuestionDialog2 from gui.filtereditor import FilterEditor -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #---------------------------------------------------------------- # diff --git a/src/gui/views/navigationview.py b/src/gui/views/navigationview.py index 684fc0a84..647bab88a 100644 --- a/src/gui/views/navigationview.py +++ b/src/gui/views/navigationview.py @@ -47,7 +47,7 @@ import gtk # #---------------------------------------------------------------- from gui.views.pageview import PageView -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from Utils import navigation_label DISABLED = -1 diff --git a/src/gui/views/pageview.py b/src/gui/views/pageview.py index 17686ba95..6d6c916b2 100644 --- a/src/gui/views/pageview.py +++ b/src/gui/views/pageview.py @@ -39,7 +39,7 @@ _LOG = logging.getLogger('.pageview') # #---------------------------------------------------------------- import gtk -from gettext import gettext as _ +from gen.ggettext import gettext as _ #---------------------------------------------------------------- # diff --git a/src/gui/views/placebaseview.py b/src/gui/views/placebaseview.py index bb6f03f3b..36eafc57f 100644 --- a/src/gui/views/placebaseview.py +++ b/src/gui/views/placebaseview.py @@ -61,7 +61,7 @@ from gen.plug import CATEGORY_QR_PLACE # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/src/gui/views/treemodels/mediamodel.py b/src/gui/views/treemodels/mediamodel.py index 4b7193052..2f58ed56b 100644 --- a/src/gui/views/treemodels/mediamodel.py +++ b/src/gui/views/treemodels/mediamodel.py @@ -25,7 +25,7 @@ # #------------------------------------------------------------------------- import time -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/gui/views/treemodels/peoplemodel.py b/src/gui/views/treemodels/peoplemodel.py index 0a0c61316..71fe48e99 100644 --- a/src/gui/views/treemodels/peoplemodel.py +++ b/src/gui/views/treemodels/peoplemodel.py @@ -33,8 +33,7 @@ TreeModel for the GRAMPS Person tree. # #------------------------------------------------------------------------- from __future__ import with_statement -#from gettext import gettext as _ -from TransUtils import gettext as _ +from gen.ggettext import gettext as _ import time import cgi diff --git a/src/gui/views/treemodels/placebasemodel.py b/src/gui/views/treemodels/placebasemodel.py index 4ba366412..20701b1f7 100644 --- a/src/gui/views/treemodels/placebasemodel.py +++ b/src/gui/views/treemodels/placebasemodel.py @@ -50,7 +50,7 @@ import GrampsLocale # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/views/treemodels/placetreemodel.py b/src/gui/views/treemodels/placetreemodel.py index dfa8a8d38..5e00c6d19 100644 --- a/src/gui/views/treemodels/placetreemodel.py +++ b/src/gui/views/treemodels/placetreemodel.py @@ -52,7 +52,7 @@ from gui.views.treemodels.treebasemodel import TreeBaseModel # Internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gui/views/treemodels/treebasemodel.py b/src/gui/views/treemodels/treebasemodel.py index 3d4549b04..2ebe33375 100644 --- a/src/gui/views/treemodels/treebasemodel.py +++ b/src/gui/views/treemodels/treebasemodel.py @@ -33,7 +33,7 @@ This module provides the model that is used for all hierarchical treeviews. from __future__ import with_statement import time import locale -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".gui.treebasemodel") diff --git a/src/gui/widgets/buttons.py b/src/gui/widgets/buttons.py index ed3519d20..3a3cfccd5 100644 --- a/src/gui/widgets/buttons.py +++ b/src/gui/widgets/buttons.py @@ -27,7 +27,7 @@ __all__ = ["IconButton", "WarnButton", "SimpleButton", "PrivacyButton"] # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.buttons") diff --git a/src/gui/widgets/expandcollapsearrow.py b/src/gui/widgets/expandcollapsearrow.py index c68282576..a99329b14 100644 --- a/src/gui/widgets/expandcollapsearrow.py +++ b/src/gui/widgets/expandcollapsearrow.py @@ -27,7 +27,7 @@ __all__ = ["ExpandCollapseArrow"] # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.expandcollapsearrow") diff --git a/src/gui/widgets/labels.py b/src/gui/widgets/labels.py index fc15d62da..9081491fb 100644 --- a/src/gui/widgets/labels.py +++ b/src/gui/widgets/labels.py @@ -30,7 +30,7 @@ __all__ = ["LinkLabel", "EditLabel", "BasicLabel", "GenderLabel", #------------------------------------------------------------------------- import os import cgi -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.labels") diff --git a/src/gui/widgets/progressdialog.py b/src/gui/widgets/progressdialog.py index 97bd85f66..a2bc9ed6a 100644 --- a/src/gui/widgets/progressdialog.py +++ b/src/gui/widgets/progressdialog.py @@ -30,7 +30,7 @@ long running operations. # #------------------------------------------------------------------------- import time -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging log = logging.getLogger("gen.progressdialog") diff --git a/src/gui/widgets/styledtextbuffer.py b/src/gui/widgets/styledtextbuffer.py index 8857b955f..860d82862 100644 --- a/src/gui/widgets/styledtextbuffer.py +++ b/src/gui/widgets/styledtextbuffer.py @@ -30,7 +30,7 @@ __all__ = ["ALLOWED_STYLES", "MATCH_START", "MATCH_END", "MATCH_FLAVOR", # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import re import logging diff --git a/src/gui/widgets/styledtexteditor.py b/src/gui/widgets/styledtexteditor.py index caf2619ae..48d5d8db1 100644 --- a/src/gui/widgets/styledtexteditor.py +++ b/src/gui/widgets/styledtexteditor.py @@ -29,7 +29,7 @@ __all__ = ["StyledTextEditor"] # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".widgets.styledtexteditor") diff --git a/src/gui/widgets/validatedmaskedentry.py b/src/gui/widgets/validatedmaskedentry.py index b43b7309e..cee8aabdd 100644 --- a/src/gui/widgets/validatedmaskedentry.py +++ b/src/gui/widgets/validatedmaskedentry.py @@ -27,7 +27,7 @@ __all__ = ["MaskedEntry", "ValidatableMaskedEntry"] # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import string import logging diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 4e7a1304c..ee962bdd9 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -29,7 +29,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Records.py b/src/plugins/Records.py index 2f3f6b47a..caf908f2f 100644 --- a/src/plugins/Records.py +++ b/src/plugins/Records.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------ import datetime -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/AsciiDoc.py b/src/plugins/docgen/AsciiDoc.py index 4e83468b5..08b2d752c 100644 --- a/src/plugins/docgen/AsciiDoc.py +++ b/src/plugins/docgen/AsciiDoc.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/GtkPrint.py b/src/plugins/docgen/GtkPrint.py index 4d30dc0d0..b107a8070 100644 --- a/src/plugins/docgen/GtkPrint.py +++ b/src/plugins/docgen/GtkPrint.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ from math import radians ##try: diff --git a/src/plugins/docgen/HtmlDoc.py b/src/plugins/docgen/HtmlDoc.py index ac342a4d0..63e90ca23 100644 --- a/src/plugins/docgen/HtmlDoc.py +++ b/src/plugins/docgen/HtmlDoc.py @@ -36,7 +36,7 @@ Report output generator for html documents, based on Html and HtmlBackend import os import shutil import time -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/LaTeXDoc.py b/src/plugins/docgen/LaTeXDoc.py index e13147607..5d1124e22 100644 --- a/src/plugins/docgen/LaTeXDoc.py +++ b/src/plugins/docgen/LaTeXDoc.py @@ -33,7 +33,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/ODFDoc.py b/src/plugins/docgen/ODFDoc.py index c346d4fbf..60eca722f 100644 --- a/src/plugins/docgen/ODFDoc.py +++ b/src/plugins/docgen/ODFDoc.py @@ -94,7 +94,7 @@ import Errors # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ _apptype = 'application/vnd.oasis.opendocument.text' diff --git a/src/plugins/docgen/PSDrawDoc.py b/src/plugins/docgen/PSDrawDoc.py index 7671aaf97..0ee991534 100644 --- a/src/plugins/docgen/PSDrawDoc.py +++ b/src/plugins/docgen/PSDrawDoc.py @@ -30,7 +30,7 @@ PostScript document generator. # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- #Gramps modules diff --git a/src/plugins/docgen/PdfDoc.py b/src/plugins/docgen/PdfDoc.py index 1af172607..e656f4eb7 100644 --- a/src/plugins/docgen/PdfDoc.py +++ b/src/plugins/docgen/PdfDoc.py @@ -29,7 +29,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/RTFDoc.py b/src/plugins/docgen/RTFDoc.py index 5d1abd628..e7754c0ba 100644 --- a/src/plugins/docgen/RTFDoc.py +++ b/src/plugins/docgen/RTFDoc.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/docgen/SvgDrawDoc.py b/src/plugins/docgen/SvgDrawDoc.py index 39c0c1fb3..048f40a75 100644 --- a/src/plugins/docgen/SvgDrawDoc.py +++ b/src/plugins/docgen/SvgDrawDoc.py @@ -30,7 +30,7 @@ SVG document generator. # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import StringIO #------------------------------------------------------------------------- diff --git a/src/plugins/drawreport/AncestorTree.py b/src/plugins/drawreport/AncestorTree.py index 1ecdf3a8e..6a1f7c77b 100644 --- a/src/plugins/drawreport/AncestorTree.py +++ b/src/plugins/drawreport/AncestorTree.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import math -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # # GRAMPS modules diff --git a/src/plugins/drawreport/Calendar.py b/src/plugins/drawreport/Calendar.py index 6f6438cb3..24a4f5388 100644 --- a/src/plugins/drawreport/Calendar.py +++ b/src/plugins/drawreport/Calendar.py @@ -24,8 +24,8 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext import datetime import time diff --git a/src/plugins/drawreport/DescendTree.py b/src/plugins/drawreport/DescendTree.py index 4ff060af0..a648b887c 100644 --- a/src/plugins/drawreport/DescendTree.py +++ b/src/plugins/drawreport/DescendTree.py @@ -36,7 +36,7 @@ from gen.plug.docgen import (GraphicsStyle, FontStyle, ParagraphStyle, from gen.plug.menu import TextOption, NumberOption, BooleanOption, PersonOption from ReportBase import Report, MenuReportOptions, ReportUtils from SubstKeywords import SubstKeywords -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/drawreport/FanChart.py b/src/plugins/drawreport/FanChart.py index 0e0328e0a..31ce7fab8 100644 --- a/src/plugins/drawreport/FanChart.py +++ b/src/plugins/drawreport/FanChart.py @@ -26,7 +26,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ from math import pi, cos, sin #------------------------------------------------------------------------ diff --git a/src/plugins/drawreport/StatisticsChart.py b/src/plugins/drawreport/StatisticsChart.py index c9fe9fb56..9b0ad9fdc 100644 --- a/src/plugins/drawreport/StatisticsChart.py +++ b/src/plugins/drawreport/StatisticsChart.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------ import time -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/drawreport/TimeLine.py b/src/plugins/drawreport/TimeLine.py index ed697ce3b..d870bdfd8 100644 --- a/src/plugins/drawreport/TimeLine.py +++ b/src/plugins/drawreport/TimeLine.py @@ -30,7 +30,7 @@ Timeline Chart # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportCsv.py b/src/plugins/export/ExportCsv.py index adbf667dc..4033f7c52 100644 --- a/src/plugins/export/ExportCsv.py +++ b/src/plugins/export/ExportCsv.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import csv import cStringIO import codecs diff --git a/src/plugins/export/ExportFtree.py b/src/plugins/export/ExportFtree.py index 6ce526ea5..3f0b0b9ab 100644 --- a/src/plugins/export/ExportFtree.py +++ b/src/plugins/export/ExportFtree.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index 1e24e1545..cb8695e2b 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -29,7 +29,7 @@ # Standard Python Modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import time diff --git a/src/plugins/export/ExportGeneWeb.py b/src/plugins/export/ExportGeneWeb.py index 601939437..480a5ea38 100644 --- a/src/plugins/export/ExportGeneWeb.py +++ b/src/plugins/export/ExportGeneWeb.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportPkg.py b/src/plugins/export/ExportPkg.py index 8565c25e8..264951842 100644 --- a/src/plugins/export/ExportPkg.py +++ b/src/plugins/export/ExportPkg.py @@ -36,7 +36,7 @@ import os import sys import tarfile from cStringIO import StringIO -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportVCalendar.py b/src/plugins/export/ExportVCalendar.py index a820a9cbd..ef5d5e526 100644 --- a/src/plugins/export/ExportVCalendar.py +++ b/src/plugins/export/ExportVCalendar.py @@ -31,7 +31,7 @@ import os import sys from time import localtime -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportVCard.py b/src/plugins/export/ExportVCard.py index 939d6ebb3..5e2774237 100644 --- a/src/plugins/export/ExportVCard.py +++ b/src/plugins/export/ExportVCard.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------- import sys import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/export/ExportXml.py b/src/plugins/export/ExportXml.py index 9483a0659..d130f247b 100644 --- a/src/plugins/export/ExportXml.py +++ b/src/plugins/export/ExportXml.py @@ -39,7 +39,7 @@ import shutil import os import codecs from xml.sax.saxutils import escape -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ diff --git a/src/plugins/gramplet/AgeOnDateGramplet.py b/src/plugins/gramplet/AgeOnDateGramplet.py index ec4533713..9184c2f99 100644 --- a/src/plugins/gramplet/AgeOnDateGramplet.py +++ b/src/plugins/gramplet/AgeOnDateGramplet.py @@ -35,7 +35,7 @@ on a particular date. # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import DateHandler from QuickReports import run_quick_report_by_name diff --git a/src/plugins/gramplet/AgeStats.py b/src/plugins/gramplet/AgeStats.py index 96af416ff..1501a0f8b 100644 --- a/src/plugins/gramplet/AgeStats.py +++ b/src/plugins/gramplet/AgeStats.py @@ -27,7 +27,7 @@ This Gramplet shows textual distributions of age breakdowns of various types. import locale from gen.plug import Gramplet -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gen.lib class AgeStatsGramplet(Gramplet): diff --git a/src/plugins/gramplet/AttributesGramplet.py b/src/plugins/gramplet/AttributesGramplet.py index e79b80596..6be4b6954 100644 --- a/src/plugins/gramplet/AttributesGramplet.py +++ b/src/plugins/gramplet/AttributesGramplet.py @@ -21,7 +21,7 @@ from gen.plug import Gramplet from gen.display.name import displayer as name_displayer -from gettext import gettext as _ +from gen.ggettext import gettext as _ class AttributesGramplet(Gramplet): """ diff --git a/src/plugins/gramplet/CalendarGramplet.py b/src/plugins/gramplet/CalendarGramplet.py index 9b04a9764..45f853089 100644 --- a/src/plugins/gramplet/CalendarGramplet.py +++ b/src/plugins/gramplet/CalendarGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from QuickReports import run_quick_report_by_name import gen.lib diff --git a/src/plugins/gramplet/DescendGramplet.py b/src/plugins/gramplet/DescendGramplet.py index e9bf4893a..db8950ee1 100644 --- a/src/plugins/gramplet/DescendGramplet.py +++ b/src/plugins/gramplet/DescendGramplet.py @@ -29,7 +29,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/gramplet/FanChartGramplet.py b/src/plugins/gramplet/FanChartGramplet.py index a3da00b17..d7fbb271f 100644 --- a/src/plugins/gramplet/FanChartGramplet.py +++ b/src/plugins/gramplet/FanChartGramplet.py @@ -53,7 +53,7 @@ if gtk.pygtk_version < (2,3,93): # #------------------------------------------------------------------------- from gen.display.name import displayer as name_displayer -from gettext import gettext as _ +from gen.ggettext import gettext as _ from gen.plug import Gramplet from Utils import (find_children, find_parents, find_witnessed_people) from libformatting import FormattingHelper diff --git a/src/plugins/gramplet/FaqGramplet.py b/src/plugins/gramplet/FaqGramplet.py index 36cbab2ce..4e267b263 100644 --- a/src/plugins/gramplet/FaqGramplet.py +++ b/src/plugins/gramplet/FaqGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/gramplet/GivenNameGramplet.py b/src/plugins/gramplet/GivenNameGramplet.py index ec0cdefe1..0f4365943 100644 --- a/src/plugins/gramplet/GivenNameGramplet.py +++ b/src/plugins/gramplet/GivenNameGramplet.py @@ -20,7 +20,7 @@ # $Id$ # # -from gettext import gettext as _ +from gen.ggettext import gettext as _ from gen.plug import Gramplet import config diff --git a/src/plugins/gramplet/PedigreeGramplet.py b/src/plugins/gramplet/PedigreeGramplet.py index 820262445..e955a73ac 100644 --- a/src/plugins/gramplet/PedigreeGramplet.py +++ b/src/plugins/gramplet/PedigreeGramplet.py @@ -33,8 +33,8 @@ import locale # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext from gen.display.name import displayer as name_displayer import DateHandler import gen diff --git a/src/plugins/gramplet/PluginManagerGramplet.py b/src/plugins/gramplet/PluginManagerGramplet.py index ab590ff9c..4af137eae 100644 --- a/src/plugins/gramplet/PluginManagerGramplet.py +++ b/src/plugins/gramplet/PluginManagerGramplet.py @@ -31,7 +31,7 @@ import urllib # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/gramplet/QuickViewGramplet.py b/src/plugins/gramplet/QuickViewGramplet.py index 3951287cd..e08e8f92d 100644 --- a/src/plugins/gramplet/QuickViewGramplet.py +++ b/src/plugins/gramplet/QuickViewGramplet.py @@ -31,7 +31,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from QuickReports import run_quick_report_by_name, get_quick_report_list from gen.plug import (CATEGORY_QR_PERSON, CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE, diff --git a/src/plugins/gramplet/RelativeGramplet.py b/src/plugins/gramplet/RelativeGramplet.py index 590d5c313..a527caad2 100644 --- a/src/plugins/gramplet/RelativeGramplet.py +++ b/src/plugins/gramplet/RelativeGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from gen.display.name import displayer as name_displayer #------------------------------------------------------------------------ diff --git a/src/plugins/gramplet/SessionLogGramplet.py b/src/plugins/gramplet/SessionLogGramplet.py index e2599e15c..e4e25cee7 100644 --- a/src/plugins/gramplet/SessionLogGramplet.py +++ b/src/plugins/gramplet/SessionLogGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from gen.display.name import displayer as name_displayer #------------------------------------------------------------------------ diff --git a/src/plugins/gramplet/StatsGramplet.py b/src/plugins/gramplet/StatsGramplet.py index 221d4fb74..b9f97e9bd 100644 --- a/src/plugins/gramplet/StatsGramplet.py +++ b/src/plugins/gramplet/StatsGramplet.py @@ -31,7 +31,7 @@ import posixpath # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from Utils import media_path_full import DateHandler import gen diff --git a/src/plugins/gramplet/SurnameCloudGramplet.py b/src/plugins/gramplet/SurnameCloudGramplet.py index 113299daf..5220146b0 100644 --- a/src/plugins/gramplet/SurnameCloudGramplet.py +++ b/src/plugins/gramplet/SurnameCloudGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import config #------------------------------------------------------------------------ diff --git a/src/plugins/gramplet/ToDoGramplet.py b/src/plugins/gramplet/ToDoGramplet.py index edde70ef7..b7da87507 100644 --- a/src/plugins/gramplet/ToDoGramplet.py +++ b/src/plugins/gramplet/ToDoGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/gramplet/TopSurnamesGramplet.py b/src/plugins/gramplet/TopSurnamesGramplet.py index 73f7d1138..c082b544d 100644 --- a/src/plugins/gramplet/TopSurnamesGramplet.py +++ b/src/plugins/gramplet/TopSurnamesGramplet.py @@ -24,7 +24,7 @@ # #------------------------------------------------------------------------ from gen.plug import Gramplet -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ import config #------------------------------------------------------------------------ diff --git a/src/plugins/gramplet/WelcomeGramplet.py b/src/plugins/gramplet/WelcomeGramplet.py index c14deff51..16dd40615 100644 --- a/src/plugins/gramplet/WelcomeGramplet.py +++ b/src/plugins/gramplet/WelcomeGramplet.py @@ -23,7 +23,7 @@ # GRAMPS modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/gramplet/WhatsNext.py b/src/plugins/gramplet/WhatsNext.py index 1b419ff81..de28d20af 100644 --- a/src/plugins/gramplet/WhatsNext.py +++ b/src/plugins/gramplet/WhatsNext.py @@ -30,7 +30,7 @@ from gen.lib import EventType, FamilyRelType, MarkerType from gen.plug import Gramplet from gen.display.name import displayer as name_displayer from ReportBase import ReportUtils -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/graph/GVFamilyLines.py b/src/plugins/graph/GVFamilyLines.py index 052f230d6..2b3935c18 100644 --- a/src/plugins/graph/GVFamilyLines.py +++ b/src/plugins/graph/GVFamilyLines.py @@ -32,7 +32,7 @@ Family Lines, a GraphViz-based plugin for Gramps. # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/graph/GVHourGlass.py b/src/plugins/graph/GVHourGlass.py index b5a827cec..5b83a2c4b 100644 --- a/src/plugins/graph/GVHourGlass.py +++ b/src/plugins/graph/GVHourGlass.py @@ -30,7 +30,7 @@ Generate an hourglass graph using the GraphViz generator. # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/graph/GVRelGraph.py b/src/plugins/graph/GVRelGraph.py index 332e5aeec..9adb52d60 100644 --- a/src/plugins/graph/GVRelGraph.py +++ b/src/plugins/graph/GVRelGraph.py @@ -38,7 +38,7 @@ Create a relationship graph using Graphviz # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/import/ImportCsv.py b/src/plugins/import/ImportCsv.py index 3863e0894..10b12caaf 100644 --- a/src/plugins/import/ImportCsv.py +++ b/src/plugins/import/ImportCsv.py @@ -30,8 +30,8 @@ # #------------------------------------------------------------------------- import time -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext import csv import codecs import cStringIO diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index 22f2357f8..ad1e19950 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/import/ImportGeneWeb.py b/src/plugins/import/ImportGeneWeb.py index 19a052fab..584199c25 100644 --- a/src/plugins/import/ImportGeneWeb.py +++ b/src/plugins/import/ImportGeneWeb.py @@ -30,8 +30,8 @@ #------------------------------------------------------------------------- import re import time -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext #------------------------------------------------------------------------ # diff --git a/src/plugins/import/ImportGpkg.py b/src/plugins/import/ImportGpkg.py index 5ae3ae0fe..758bd8edc 100644 --- a/src/plugins/import/ImportGpkg.py +++ b/src/plugins/import/ImportGpkg.py @@ -31,7 +31,7 @@ #------------------------------------------------------------------------- import os import tarfile -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/import/ImportGrdb.py b/src/plugins/import/ImportGrdb.py index 7ec0b778b..5356e6c0a 100644 --- a/src/plugins/import/ImportGrdb.py +++ b/src/plugins/import/ImportGrdb.py @@ -33,7 +33,7 @@ from __future__ import with_statement import os import shutil import tempfile -from gettext import gettext as _ +from gen.ggettext import gettext as _ import cPickle as pickle import time from bsddb import dbshelve, db diff --git a/src/plugins/import/ImportProGen.py b/src/plugins/import/ImportProGen.py index 667f7aa40..ddcbff66b 100644 --- a/src/plugins/import/ImportProGen.py +++ b/src/plugins/import/ImportProGen.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import re -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import struct diff --git a/src/plugins/import/ImportVCard.py b/src/plugins/import/ImportVCard.py index be4b6e750..cde1b6ca2 100644 --- a/src/plugins/import/ImportVCard.py +++ b/src/plugins/import/ImportVCard.py @@ -30,8 +30,8 @@ #------------------------------------------------------------------------- import re import time -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext #------------------------------------------------------------------------ # diff --git a/src/plugins/import/ImportXml.py b/src/plugins/import/ImportXml.py index fe67cfe0d..05b1449a7 100644 --- a/src/plugins/import/ImportXml.py +++ b/src/plugins/import/ImportXml.py @@ -29,7 +29,7 @@ import os import sys from xml.parsers.expat import ExpatError, ParserCreate -from gettext import gettext as _ +from gen.ggettext import gettext as _ import re #------------------------------------------------------------------------- diff --git a/src/plugins/lib/libcairodoc.py b/src/plugins/lib/libcairodoc.py index 7f2d424fd..51019bdf6 100644 --- a/src/plugins/lib/libcairodoc.py +++ b/src/plugins/lib/libcairodoc.py @@ -31,7 +31,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ from math import radians #------------------------------------------------------------------------ diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py index fc93a44f7..2186f830f 100644 --- a/src/plugins/lib/libgedcom.py +++ b/src/plugins/lib/libgedcom.py @@ -91,7 +91,7 @@ import os import re import time import codecs -from gettext import gettext as _ +from gen.ggettext import gettext as _ from xml.parsers.expat import ParserCreate from collections import defaultdict import cStringIO diff --git a/src/plugins/lib/libgrdb.py b/src/plugins/lib/libgrdb.py index 848b673a5..c7371b502 100644 --- a/src/plugins/lib/libgrdb.py +++ b/src/plugins/lib/libgrdb.py @@ -37,7 +37,7 @@ import locale import os from sys import maxint from bsddb import db -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging LOG = logging.getLogger(".Db") diff --git a/src/plugins/lib/libholiday.py b/src/plugins/lib/libholiday.py index 1eb24e35e..4570da273 100644 --- a/src/plugins/lib/libholiday.py +++ b/src/plugins/lib/libholiday.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ from xml.parsers import expat import datetime import math diff --git a/src/plugins/lib/libhtmlconst.py b/src/plugins/lib/libhtmlconst.py index 4888bc659..df5b341dc 100644 --- a/src/plugins/lib/libhtmlconst.py +++ b/src/plugins/lib/libhtmlconst.py @@ -30,7 +30,7 @@ General constants used in different html enabled plugins """ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/lib/libtranslate.py b/src/plugins/lib/libtranslate.py index 6fbdaf481..05c9cc18b 100644 --- a/src/plugins/lib/libtranslate.py +++ b/src/plugins/lib/libtranslate.py @@ -207,34 +207,6 @@ class Translator: sep_idx = msgid.rfind(sep) msgval = msgid[sep_idx+1:] return unicode(msgval) - - def sngettext(self, singular, plural, n, sep='|'): - """ - Strip the context used for resolving translation ambiguities. - - The translation of singular/plural is returned unless the translation is - not available and the singular contains the separator. In that case, - the returned value is the portion of singular following the last - separator. Default separator is '|'. - - :param singular: The singular form of the string to be translated. - may contain a context seperator - :type singular: unicode - :param plural: The plural form of the string to be translated. - :type plural: unicode - :param n: the amount for which to decide the translation - :type n: int - :param sep: The separator marking the context. - :type sep: unicode - :returns: Translation or the original with context stripped. - :rtype: unicode - - """ - msgval = self.ngettext(singular, plural, n) - if msgval == singular: - sep_idx = singular.rfind(sep) - msgval = singular[sep_idx+1:] - return unicode(msgval) def get_date(self, date): """ diff --git a/src/plugins/mapservices/eniroswedenmap.py b/src/plugins/mapservices/eniroswedenmap.py index 38ee8b232..a3ba144f4 100644 --- a/src/plugins/mapservices/eniroswedenmap.py +++ b/src/plugins/mapservices/eniroswedenmap.py @@ -28,7 +28,7 @@ Eniro Sweden (Denmark) map service plugin. Opens place in kartor.eniro.se # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/mapservices/googlemap.py b/src/plugins/mapservices/googlemap.py index c7f48785c..289cb615c 100644 --- a/src/plugins/mapservices/googlemap.py +++ b/src/plugins/mapservices/googlemap.py @@ -28,7 +28,7 @@ Google Maps map service plugin. Open place in maps.google.com # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/mapservices/openstreetmap.py b/src/plugins/mapservices/openstreetmap.py index 8fa8da7d0..b28b67ad5 100644 --- a/src/plugins/mapservices/openstreetmap.py +++ b/src/plugins/mapservices/openstreetmap.py @@ -28,7 +28,7 @@ OpenStreetMap map service plugin. Open place in openstreetmap.org # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/quickview/AgeOnDate.py b/src/plugins/quickview/AgeOnDate.py index fadf37bd9..23cac96dd 100644 --- a/src/plugins/quickview/AgeOnDate.py +++ b/src/plugins/quickview/AgeOnDate.py @@ -28,7 +28,7 @@ Display references for any object """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ import DateHandler import gen.lib import config diff --git a/src/plugins/quickview/AttributeMatch.py b/src/plugins/quickview/AttributeMatch.py index 091494796..4fbf77dc9 100644 --- a/src/plugins/quickview/AttributeMatch.py +++ b/src/plugins/quickview/AttributeMatch.py @@ -23,7 +23,7 @@ # from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ def run(database, document, attribute, value=None): sdb = SimpleAccess(database) diff --git a/src/plugins/quickview/FilterByName.py b/src/plugins/quickview/FilterByName.py index 2406ad605..96546350f 100644 --- a/src/plugins/quickview/FilterByName.py +++ b/src/plugins/quickview/FilterByName.py @@ -34,8 +34,8 @@ from gen.lib import Person import DateHandler import posixpath -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext fname_map = {'all people': _('Filtering_on|all people'), 'males': _('Filtering_on|males'), diff --git a/src/plugins/quickview/OnThisDay.py b/src/plugins/quickview/OnThisDay.py index a3f5048fd..727b50594 100644 --- a/src/plugins/quickview/OnThisDay.py +++ b/src/plugins/quickview/OnThisDay.py @@ -27,7 +27,7 @@ Display all events on a particular day. """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ import gen.lib def get_ref(db, objclass, handle): diff --git a/src/plugins/quickview/References.py b/src/plugins/quickview/References.py index dea51cb80..94292da9d 100644 --- a/src/plugins/quickview/References.py +++ b/src/plugins/quickview/References.py @@ -27,7 +27,7 @@ Display references for any object """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ def get_ref(db, objclass, handle): """ diff --git a/src/plugins/quickview/Reporef.py b/src/plugins/quickview/Reporef.py index fd8341188..05bdabc0e 100755 --- a/src/plugins/quickview/Reporef.py +++ b/src/plugins/quickview/Reporef.py @@ -32,7 +32,7 @@ Display RepoRef for sources related to active repository """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ def run(database, document, repo): """ diff --git a/src/plugins/quickview/SameSurnames.py b/src/plugins/quickview/SameSurnames.py index 41749ed37..dc5cb80c0 100644 --- a/src/plugins/quickview/SameSurnames.py +++ b/src/plugins/quickview/SameSurnames.py @@ -28,8 +28,8 @@ Display a people who have a person's same surname or given name. """ from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext import gen.lib from Filters.Rules import Rule from Filters import GenericFilterFactory diff --git a/src/plugins/quickview/all_events.py b/src/plugins/quickview/all_events.py index 2e369ded0..9d88eb03a 100644 --- a/src/plugins/quickview/all_events.py +++ b/src/plugins/quickview/all_events.py @@ -27,7 +27,7 @@ Display a person's events, both personal and family """ from Simple import SimpleAccess, by_date, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ def run(database, document, person): """ diff --git a/src/plugins/quickview/all_relations.py b/src/plugins/quickview/all_relations.py index d8ea22089..400e40042 100644 --- a/src/plugins/quickview/all_relations.py +++ b/src/plugins/quickview/all_relations.py @@ -32,7 +32,7 @@ Display a person's relations to the home person #------------------------------------------------------------------------- from Simple import SimpleAccess, SimpleDoc -from gettext import gettext as _ +from gen.ggettext import gettext as _ import Relationship # define the formatting string once as a constant. Since this is reused diff --git a/src/plugins/quickview/lineage.py b/src/plugins/quickview/lineage.py index 49604e487..da901770b 100644 --- a/src/plugins/quickview/lineage.py +++ b/src/plugins/quickview/lineage.py @@ -34,7 +34,7 @@ Display a person's father or mother lineage import gen.lib from Simple import SimpleAccess, SimpleDoc, SimpleTable -from gettext import gettext as _ +from gen.ggettext import gettext as _ __FMT = "%-30s\t%-12s\t%-12s" __FMT_REM = " %s: %s" diff --git a/src/plugins/quickview/siblings.py b/src/plugins/quickview/siblings.py index 94912e05f..e4bede8d8 100644 --- a/src/plugins/quickview/siblings.py +++ b/src/plugins/quickview/siblings.py @@ -28,7 +28,7 @@ Display a person's siblings in a report window from Simple import SimpleAccess, SimpleDoc, SimpleTable import Relationship -from gettext import gettext as _ +from gen.ggettext import gettext as _ def run(database, document, person): """ diff --git a/src/plugins/textreport/AncestorReport.py b/src/plugins/textreport/AncestorReport.py index 805859a81..6b2286e57 100644 --- a/src/plugins/textreport/AncestorReport.py +++ b/src/plugins/textreport/AncestorReport.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import math -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/BirthdayReport.py b/src/plugins/textreport/BirthdayReport.py index 77061e063..7f6309388 100644 --- a/src/plugins/textreport/BirthdayReport.py +++ b/src/plugins/textreport/BirthdayReport.py @@ -26,8 +26,8 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext import datetime, time #------------------------------------------------------------------------ diff --git a/src/plugins/textreport/CustomBookText.py b/src/plugins/textreport/CustomBookText.py index ea8502021..b66a0c352 100644 --- a/src/plugins/textreport/CustomBookText.py +++ b/src/plugins/textreport/CustomBookText.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/DescendReport.py b/src/plugins/textreport/DescendReport.py index 8462f7c44..ff42cef16 100644 --- a/src/plugins/textreport/DescendReport.py +++ b/src/plugins/textreport/DescendReport.py @@ -31,7 +31,7 @@ Reports/Text Reports/Descendant Report. # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/DetAncestralReport.py b/src/plugins/textreport/DetAncestralReport.py index 63b4725bc..6ee5a6cb5 100644 --- a/src/plugins/textreport/DetAncestralReport.py +++ b/src/plugins/textreport/DetAncestralReport.py @@ -31,7 +31,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/DetDescendantReport.py b/src/plugins/textreport/DetDescendantReport.py index 7f120fa29..c27d3532e 100644 --- a/src/plugins/textreport/DetDescendantReport.py +++ b/src/plugins/textreport/DetDescendantReport.py @@ -32,7 +32,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/EndOfLineReport.py b/src/plugins/textreport/EndOfLineReport.py index d31a786ca..f24541a1f 100644 --- a/src/plugins/textreport/EndOfLineReport.py +++ b/src/plugins/textreport/EndOfLineReport.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/FamilyGroup.py b/src/plugins/textreport/FamilyGroup.py index 9d2a744b3..45d3f3111 100644 --- a/src/plugins/textreport/FamilyGroup.py +++ b/src/plugins/textreport/FamilyGroup.py @@ -35,7 +35,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, FONT_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) import DateHandler -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from gen.display.name import displayer as _nd #------------------------------------------------------------------------ diff --git a/src/plugins/textreport/IndivComplete.py b/src/plugins/textreport/IndivComplete.py index d8fdfa88b..5f505d619 100644 --- a/src/plugins/textreport/IndivComplete.py +++ b/src/plugins/textreport/IndivComplete.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ from collections import defaultdict #------------------------------------------------------------------------ diff --git a/src/plugins/textreport/KinshipReport.py b/src/plugins/textreport/KinshipReport.py index 82552d7e8..9181c719a 100644 --- a/src/plugins/textreport/KinshipReport.py +++ b/src/plugins/textreport/KinshipReport.py @@ -29,7 +29,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/MarkerReport.py b/src/plugins/textreport/MarkerReport.py index 95312bb98..209187504 100644 --- a/src/plugins/textreport/MarkerReport.py +++ b/src/plugins/textreport/MarkerReport.py @@ -28,7 +28,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/NumberOfAncestorsReport.py b/src/plugins/textreport/NumberOfAncestorsReport.py index 11be8197a..fff0ef2fe 100644 --- a/src/plugins/textreport/NumberOfAncestorsReport.py +++ b/src/plugins/textreport/NumberOfAncestorsReport.py @@ -30,8 +30,8 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ -from gettext import ngettext +from gen.ggettext import gettext as _ +from gen.ggettext import ngettext import locale import math diff --git a/src/plugins/textreport/PlaceReport.py b/src/plugins/textreport/PlaceReport.py index c1e86e5af..2e6f06a47 100644 --- a/src/plugins/textreport/PlaceReport.py +++ b/src/plugins/textreport/PlaceReport.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/SimpleBookTitle.py b/src/plugins/textreport/SimpleBookTitle.py index bec403880..c7e72a150 100644 --- a/src/plugins/textreport/SimpleBookTitle.py +++ b/src/plugins/textreport/SimpleBookTitle.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import time -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/textreport/Summary.py b/src/plugins/textreport/Summary.py index 67e3855ea..777d48116 100644 --- a/src/plugins/textreport/Summary.py +++ b/src/plugins/textreport/Summary.py @@ -31,7 +31,7 @@ Reports/Text Reports/Database Summary Report. # #------------------------------------------------------------------------ import posixpath -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/CalculateEstimatedDates.py b/src/plugins/tool/CalculateEstimatedDates.py index 2b063a319..33bb47d95 100644 --- a/src/plugins/tool/CalculateEstimatedDates.py +++ b/src/plugins/tool/CalculateEstimatedDates.py @@ -29,7 +29,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from gen.ggettext import gettext as _ import time #------------------------------------------------------------------------ diff --git a/src/plugins/tool/ChangeNames.py b/src/plugins/tool/ChangeNames.py index fa5e904f7..4def28b80 100644 --- a/src/plugins/tool/ChangeNames.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/tool/ChangeTypes.py b/src/plugins/tool/ChangeTypes.py index 05c109a60..b9c27c22b 100644 --- a/src/plugins/tool/ChangeTypes.py +++ b/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 #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/Check.py b/src/plugins/tool/Check.py index b5fdc7d39..64404f4db 100644 --- a/src/plugins/tool/Check.py +++ b/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 #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/DateParserDisplayTest.py b/src/plugins/tool/DateParserDisplayTest.py index ba9183674..cd1bb99b3 100644 --- a/src/plugins/tool/DateParserDisplayTest.py +++ b/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 _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/Desbrowser.py b/src/plugins/tool/Desbrowser.py index 012d37ccd..495ee1916 100644 --- a/src/plugins/tool/Desbrowser.py +++ b/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 diff --git a/src/plugins/tool/DumpGenderStats.py b/src/plugins/tool/DumpGenderStats.py index a909c130a..be63074ad 100644 --- a/src/plugins/tool/DumpGenderStats.py +++ b/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 diff --git a/src/plugins/tool/Eval.py b/src/plugins/tool/Eval.py index 702b00880..6f6180a58 100644 --- a/src/plugins/tool/Eval.py +++ b/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 #------------------------------------------------------------------------ diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py index 5f4111248..bac13b119 100644 --- a/src/plugins/tool/EventCmp.py +++ b/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 diff --git a/src/plugins/tool/EventNames.py b/src/plugins/tool/EventNames.py index 0933b55ae..423df3f54 100644 --- a/src/plugins/tool/EventNames.py +++ b/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 #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/ExtractCity.py b/src/plugins/tool/ExtractCity.py index 87f41438b..925f53e8d 100644 --- a/src/plugins/tool/ExtractCity.py +++ b/src/plugins/tool/ExtractCity.py @@ -30,7 +30,7 @@ # #------------------------------------------------------------------------- import re -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/FindDupes.py b/src/plugins/tool/FindDupes.py index d00989b61..bef1168c1 100644 --- a/src/plugins/tool/FindDupes.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/tool/Leak.py b/src/plugins/tool/Leak.py index 1d6475e2e..c3268f7c9 100644 --- a/src/plugins/tool/Leak.py +++ b/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 #------------------------------------------------------------------------ diff --git a/src/plugins/tool/MediaManager.py b/src/plugins/tool/MediaManager.py index b2fae4e22..7a91b4e55 100644 --- a/src/plugins/tool/MediaManager.py +++ b/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 _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py index 0aa468e73..9d6c547c9 100644 --- a/src/plugins/tool/NotRelated.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py index 97d28f38a..ad925a185 100644 --- a/src/plugins/tool/OwnerEditor.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/tool/PHPGedViewConnector.py b/src/plugins/tool/PHPGedViewConnector.py index fd9ea490d..fe2801444 100644 --- a/src/plugins/tool/PHPGedViewConnector.py +++ b/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 diff --git a/src/plugins/tool/PatchNames.py b/src/plugins/tool/PatchNames.py index 83d2568c3..afd915a87 100644 --- a/src/plugins/tool/PatchNames.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/tool/Rebuild.py b/src/plugins/tool/Rebuild.py index c7a5efb9e..067c14a97 100644 --- a/src/plugins/tool/Rebuild.py +++ b/src/plugins/tool/Rebuild.py @@ -28,7 +28,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/RebuildRefMap.py b/src/plugins/tool/RebuildRefMap.py index 0c71e4f01..b5c093843 100644 --- a/src/plugins/tool/RebuildRefMap.py +++ b/src/plugins/tool/RebuildRefMap.py @@ -30,7 +30,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/RelCalc.py b/src/plugins/tool/RelCalc.py index 3e41cb852..290c73b60 100644 --- a/src/plugins/tool/RelCalc.py +++ b/src/plugins/tool/RelCalc.py @@ -29,7 +29,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/RemoveUnused.py b/src/plugins/tool/RemoveUnused.py index 4d826ac8e..55128685e 100644 --- a/src/plugins/tool/RemoveUnused.py +++ b/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 _ #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/ReorderIds.py b/src/plugins/tool/ReorderIds.py index 85e0f2b99..965febe67 100644 --- a/src/plugins/tool/ReorderIds.py +++ b/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 _ #------------------------------------------------------------------------ # diff --git a/src/plugins/tool/SortEvents.py b/src/plugins/tool/SortEvents.py index 89e52795d..6fe94f4b0 100644 --- a/src/plugins/tool/SortEvents.py +++ b/src/plugins/tool/SortEvents.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/SoundGen.py b/src/plugins/tool/SoundGen.py index 48e9cf975..64a86b1a9 100644 --- a/src/plugins/tool/SoundGen.py +++ b/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 diff --git a/src/plugins/tool/TestcaseGenerator.py b/src/plugins/tool/TestcaseGenerator.py index 5a589db48..be808a65c 100644 --- a/src/plugins/tool/TestcaseGenerator.py +++ b/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 _ #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py index 91fdb2f5d..151ff7ae7 100644 --- a/src/plugins/tool/Verify.py +++ b/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 #------------------------------------------------------------------------- diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index db102fa1d..d6b80edc5 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -29,7 +29,7 @@ Provide the event view. # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.eventview") diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index b23e4811f..862624ba3 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -28,7 +28,7 @@ Family View. # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.eventview") #------------------------------------------------------------------------- diff --git a/src/plugins/view/fanchartview.py b/src/plugins/view/fanchartview.py index f88907da8..dd3211c82 100644 --- a/src/plugins/view/fanchartview.py +++ b/src/plugins/view/fanchartview.py @@ -43,7 +43,7 @@ try: import cairo except ImportError: pass -from gettext import gettext as _ +from gen.ggettext import gettext as _ if gtk.pygtk_version < (2,3,93): raise Exception("PyGtk 2.3.93 or later required") diff --git a/src/plugins/view/geoview.py b/src/plugins/view/geoview.py index 62f24dcc7..71c265ac2 100644 --- a/src/plugins/view/geoview.py +++ b/src/plugins/view/geoview.py @@ -36,7 +36,7 @@ Geo View # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import urlparse import const diff --git a/src/plugins/view/grampletview.py b/src/plugins/view/grampletview.py index 0d280c0c7..063d814e2 100644 --- a/src/plugins/view/grampletview.py +++ b/src/plugins/view/grampletview.py @@ -35,7 +35,7 @@ import traceback import time import types import os -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/view/htmlrenderer.py b/src/plugins/view/htmlrenderer.py index b1b289beb..35f1f073a 100644 --- a/src/plugins/view/htmlrenderer.py +++ b/src/plugins/view/htmlrenderer.py @@ -32,7 +32,7 @@ Can use the Webkit or Gecko ( Mozilla ) library # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import os import locale import urlparse diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index 715b2fc01..b15bfffb5 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -29,7 +29,7 @@ Media View. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import urlparse import os import cPickle as pickle diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index 3fe24d1c1..7b45d98f3 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -28,7 +28,7 @@ Note View. # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ import logging _LOG = logging.getLogger(".plugins.noteview") diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py index 68bc81489..10d5b1584 100644 --- a/src/plugins/view/pedigreeview.py +++ b/src/plugins/view/pedigreeview.py @@ -27,8 +27,8 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext from cgi import escape import math diff --git a/src/plugins/view/pedigreeviewext.py b/src/plugins/view/pedigreeviewext.py index ffc749278..9e69e17af 100644 --- a/src/plugins/view/pedigreeviewext.py +++ b/src/plugins/view/pedigreeviewext.py @@ -28,8 +28,8 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext from cgi import escape import math diff --git a/src/plugins/view/personview.py b/src/plugins/view/personview.py index ab92b56b5..e8eb90d52 100644 --- a/src/plugins/view/personview.py +++ b/src/plugins/view/personview.py @@ -64,7 +64,7 @@ from gen.plug import CATEGORY_QR_PERSON # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/view/placetreeview.py b/src/plugins/view/placetreeview.py index 01604c228..0b638c008 100644 --- a/src/plugins/view/placetreeview.py +++ b/src/plugins/view/placetreeview.py @@ -40,7 +40,7 @@ from gui.editors import EditPlace # Internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/view/placeview.py b/src/plugins/view/placeview.py index fe5c75b08..a613b2ee3 100644 --- a/src/plugins/view/placeview.py +++ b/src/plugins/view/placeview.py @@ -36,7 +36,7 @@ from gui.views.treemodels import PlaceModel # Internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py index 96f608174..0e2cc8e91 100644 --- a/src/plugins/view/relview.py +++ b/src/plugins/view/relview.py @@ -29,8 +29,8 @@ Relationship View # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext import cgi #------------------------------------------------------------------------- diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index c1f134a4d..a73dfc193 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -52,7 +52,7 @@ from gen.plug import CATEGORY_QR_REPOSITORY # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index b11082354..3d159b9f1 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -54,7 +54,7 @@ from gen.plug import CATEGORY_QR_SOURCE # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from gen.ggettext import gettext as _ #------------------------------------------------------------------------- diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index a264034a5..0166bc0d7 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -60,7 +60,7 @@ import codecs import tarfile import tempfile import operator -from TransUtils import sgettext as _ +from gen.ggettext import sgettext as _ from cStringIO import StringIO from textwrap import TextWrapper from unicodedata import normalize diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 353516a74..211f016a3 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -36,8 +36,8 @@ from __future__ import with_statement #------------------------------------------------------------------------ import os, codecs, shutil, re import datetime, calendar -from TransUtils import sgettext as _ -from gettext import ngettext +from gen.ggettext import sgettext as _ +from gen.ggettext import ngettext from itertools import imap #------------------------------------------------------------------------