diff --git a/ChangeLog b/ChangeLog index b0f7ec3a3..1c5d9ade1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 2006-04-06 Alex Roitman + * various: Revert back to using gettext except for the modules + that need context -- those will use TransUtils.sgettext * src/Makefile.am (gdir_PYTHON): Add new files to the list. * src/Editors/_EditLdsOrd.py (EditLdsOrd): Formatting. * src/GrampsWidgets.py (MonitoredMenu): Factor out commong code. diff --git a/src/AddMedia.py b/src/AddMedia.py index 396e5c81e..97406c48e 100644 --- a/src/AddMedia.py +++ b/src/AddMedia.py @@ -36,7 +36,7 @@ import os # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/ArgHandler.py b/src/ArgHandler.py index 37ac1040c..9faf30a4b 100644 --- a/src/ArgHandler.py +++ b/src/ArgHandler.py @@ -33,7 +33,7 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import os import getopt -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Assistant.py b/src/Assistant.py index 4ba5d68bd..7d08a1107 100644 --- a/src/Assistant.py +++ b/src/Assistant.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/Bookmarks.py b/src/Bookmarks.py index 4c5a7e095..6acc48fae 100644 --- a/src/Bookmarks.py +++ b/src/Bookmarks.py @@ -30,7 +30,7 @@ __version__ = "$Revision$" # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ from cStringIO import StringIO #------------------------------------------------------------------------- diff --git a/src/ColumnOrder.py b/src/ColumnOrder.py index 1e384f227..a168d148d 100644 --- a/src/ColumnOrder.py +++ b/src/ColumnOrder.py @@ -29,7 +29,7 @@ import gtk.glade import gc import const -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/DataViews/_EventView.py b/src/DataViews/_EventView.py index ded9e7a94..6086e3d3b 100644 --- a/src/DataViews/_EventView.py +++ b/src/DataViews/_EventView.py @@ -46,7 +46,7 @@ from Editors import EditEvent, DelEventQuery # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('Description'), diff --git a/src/DataViews/_FamilyList.py b/src/DataViews/_FamilyList.py index d9404bbb6..3dc7036af 100644 --- a/src/DataViews/_FamilyList.py +++ b/src/DataViews/_FamilyList.py @@ -45,7 +45,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('ID'), diff --git a/src/DataViews/_FamilyView.py b/src/DataViews/_FamilyView.py index 2d5f6de71..640a4cc20 100644 --- a/src/DataViews/_FamilyView.py +++ b/src/DataViews/_FamilyView.py @@ -3,7 +3,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import gc import re import cgi diff --git a/src/DataViews/_MapView.py b/src/DataViews/_MapView.py index a3beec9c0..9b486ae9a 100644 --- a/src/DataViews/_MapView.py +++ b/src/DataViews/_MapView.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import gc import re import logging diff --git a/src/DataViews/_MediaView.py b/src/DataViews/_MediaView.py index 6ce3862aa..e4377d364 100644 --- a/src/DataViews/_MediaView.py +++ b/src/DataViews/_MediaView.py @@ -44,7 +44,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('Title'), diff --git a/src/DataViews/_PedigreeView.py b/src/DataViews/_PedigreeView.py index 899bb31ce..0f3cbdfde 100644 --- a/src/DataViews/_PedigreeView.py +++ b/src/DataViews/_PedigreeView.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 616d7d0a0..b5c2cbb56 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import cPickle as pickle #------------------------------------------------------------------------- diff --git a/src/DataViews/_PlaceView.py b/src/DataViews/_PlaceView.py index 3645c91bb..6967e8304 100644 --- a/src/DataViews/_PlaceView.py +++ b/src/DataViews/_PlaceView.py @@ -46,7 +46,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('Place Name'), diff --git a/src/DataViews/_RepositoryView.py b/src/DataViews/_RepositoryView.py index 8228ae1d9..a482025bc 100644 --- a/src/DataViews/_RepositoryView.py +++ b/src/DataViews/_RepositoryView.py @@ -47,7 +47,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('Name'), diff --git a/src/DataViews/_SourceView.py b/src/DataViews/_SourceView.py index 425c6de88..fd8efa97a 100644 --- a/src/DataViews/_SourceView.py +++ b/src/DataViews/_SourceView.py @@ -47,7 +47,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ column_names = [ _('Title'), diff --git a/src/DateEdit.py b/src/DateEdit.py index 17895dfe6..84f20e8c2 100644 --- a/src/DateEdit.py +++ b/src/DateEdit.py @@ -41,7 +41,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import gc #------------------------------------------------------------------------- diff --git a/src/DateHandler/_DateDisplay.py b/src/DateHandler/_DateDisplay.py index e686d6dfe..e4cbe1325 100644 --- a/src/DateHandler/_DateDisplay.py +++ b/src/DateHandler/_DateDisplay.py @@ -33,7 +33,7 @@ __version__ = "$Revision$" # python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/DisplayModels.py b/src/DisplayModels.py index c0b9eb672..550323d7c 100644 --- a/src/DisplayModels.py +++ b/src/DisplayModels.py @@ -25,7 +25,7 @@ # #------------------------------------------------------------------------- import time -from TransUtils import sgettext as _ +from gettext import gettext as _ import locale import logging diff --git a/src/DisplayTabs.py b/src/DisplayTabs.py index 4ad9d39af..b5f1fc15c 100644 --- a/src/DisplayTabs.py +++ b/src/DisplayTabs.py @@ -34,7 +34,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import pickle try: diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py index 82ff6cefa..dddad6682 100644 --- a/src/Editors/_EditAddress.py +++ b/src/Editors/_EditAddress.py @@ -30,7 +30,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditAttribute.py b/src/Editors/_EditAttribute.py index faa87cc01..fa7fd41b6 100644 --- a/src/Editors/_EditAttribute.py +++ b/src/Editors/_EditAttribute.py @@ -33,7 +33,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index cc135a543..d2f5b01ec 100644 --- a/src/Editors/_EditEvent.py +++ b/src/Editors/_EditEvent.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py index 0c9d97657..91d5bfcc0 100644 --- a/src/Editors/_EditEventRef.py +++ b/src/Editors/_EditEventRef.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index fbcc86bfd..f0a7c65a9 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import cPickle as pickle -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index f04ecbbec..56378ea2d 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/src/Editors/_EditLdsOrd.py @@ -33,7 +33,7 @@ __version__ = "$Revision: 6248 $" # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditLocation.py b/src/Editors/_EditLocation.py index 330a5a662..cbef36450 100644 --- a/src/Editors/_EditLocation.py +++ b/src/Editors/_EditLocation.py @@ -38,7 +38,7 @@ import Utils from _EditSecondary import EditSecondary from GrampsWidgets import * -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py index 0272da8d4..d15fdf1ab 100644 --- a/src/Editors/_EditMedia.py +++ b/src/Editors/_EditMedia.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/Editors/_EditMediaRef.py b/src/Editors/_EditMediaRef.py index 80ab434f2..b54cc6858 100644 --- a/src/Editors/_EditMediaRef.py +++ b/src/Editors/_EditMediaRef.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py index 51f597c74..e1fa748a8 100644 --- a/src/Editors/_EditName.py +++ b/src/Editors/_EditName.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditPerson.py b/src/Editors/_EditPerson.py index 7bb60bc2f..55136076c 100644 --- a/src/Editors/_EditPerson.py +++ b/src/Editors/_EditPerson.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- import os import locale -from TransUtils import sgettext as _ +from gettext import gettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/src/Editors/_EditPlace.py b/src/Editors/_EditPlace.py index f0a87628e..902e1d413 100644 --- a/src/Editors/_EditPlace.py +++ b/src/Editors/_EditPlace.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import cPickle as pickle -from TransUtils import sgettext as _ +from gettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/Editors/_EditPrimary.py b/src/Editors/_EditPrimary.py index 7146bc9e0..f1236c3ab 100644 --- a/src/Editors/_EditPrimary.py +++ b/src/Editors/_EditPrimary.py @@ -20,7 +20,7 @@ # $Id$ -from TransUtils import sgettext as _ +from gettext import gettext as _ import ManagedWindow import DateHandler diff --git a/src/Editors/_EditReference.py b/src/Editors/_EditReference.py index 84ec8d57f..ad3f02409 100644 --- a/src/Editors/_EditReference.py +++ b/src/Editors/_EditReference.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/Editors/_EditRepoRef.py b/src/Editors/_EditRepoRef.py index 580c8a57e..31a06bf1d 100644 --- a/src/Editors/_EditRepoRef.py +++ b/src/Editors/_EditRepoRef.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/Editors/_EditRepository.py b/src/Editors/_EditRepository.py index be8d07413..35e487cd7 100644 --- a/src/Editors/_EditRepository.py +++ b/src/Editors/_EditRepository.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditSecondary.py b/src/Editors/_EditSecondary.py index 7d292a463..37d6d6d16 100644 --- a/src/Editors/_EditSecondary.py +++ b/src/Editors/_EditSecondary.py @@ -20,7 +20,7 @@ # $Id$ -from TransUtils import sgettext as _ +from gettext import gettext as _ import ManagedWindow import Config diff --git a/src/Editors/_EditSource.py b/src/Editors/_EditSource.py index ef4ebae44..61c6c90c5 100644 --- a/src/Editors/_EditSource.py +++ b/src/Editors/_EditSource.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py index ff30a582b..f68518b1f 100644 --- a/src/Editors/_EditSourceRef.py +++ b/src/Editors/_EditSourceRef.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/Editors/_EditUrl.py b/src/Editors/_EditUrl.py index 3a6f52aca..e1640de84 100644 --- a/src/Editors/_EditUrl.py +++ b/src/Editors/_EditUrl.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/src/Exporter.py b/src/Exporter.py index 82ff4db29..f75386b8d 100644 --- a/src/Exporter.py +++ b/src/Exporter.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 67dfc2f2e..867cd08b1 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- import os import sets -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/GrampsDb/_GrampsBSDDB.py b/src/GrampsDb/_GrampsBSDDB.py index c0d0aea78..e5231ed8d 100644 --- a/src/GrampsDb/_GrampsBSDDB.py +++ b/src/GrampsDb/_GrampsBSDDB.py @@ -34,7 +34,7 @@ import os import time import locale import sets -from TransUtils import sgettext as _ +from gettext import gettext as _ from bsddb import dbshelve, db import logging log = logging.getLogger(".GrampsDb") diff --git a/src/GrampsDb/_GrampsDbBase.py b/src/GrampsDb/_GrampsDbBase.py index c62b49ff4..4025967bd 100644 --- a/src/GrampsDb/_GrampsDbBase.py +++ b/src/GrampsDb/_GrampsDbBase.py @@ -37,7 +37,7 @@ import locale import re from sys import maxint import sets -from TransUtils import sgettext as _ +from gettext import gettext as _ import logging log = logging.getLogger(".GrampsDb") diff --git a/src/GrampsDb/_ReadGedcom.py b/src/GrampsDb/_ReadGedcom.py index 138c9cda0..774289775 100644 --- a/src/GrampsDb/_ReadGedcom.py +++ b/src/GrampsDb/_ReadGedcom.py @@ -34,7 +34,7 @@ import const import lds import time -from TransUtils import sgettext as _ +from gettext import gettext as _ # and module sets for earlier pythons try: diff --git a/src/GrampsDb/_ReadGrdb.py b/src/GrampsDb/_ReadGrdb.py index 52d0a2e03..04d95e025 100644 --- a/src/GrampsDb/_ReadGrdb.py +++ b/src/GrampsDb/_ReadGrdb.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ import sets #------------------------------------------------------------------------- diff --git a/src/GrampsDb/_ReadXML.py b/src/GrampsDb/_ReadXML.py index d4366d222..4cfaba37b 100644 --- a/src/GrampsDb/_ReadXML.py +++ b/src/GrampsDb/_ReadXML.py @@ -29,7 +29,7 @@ import os import sets import shutil from xml.parsers.expat import ExpatError, ParserCreate -from TransUtils import sgettext as _ +from gettext import gettext as _ import re #------------------------------------------------------------------------ diff --git a/src/GrampsDb/_WriteGedcom.py b/src/GrampsDb/_WriteGedcom.py index 2fe1cbd0d..6427e621f 100644 --- a/src/GrampsDb/_WriteGedcom.py +++ b/src/GrampsDb/_WriteGedcom.py @@ -36,7 +36,7 @@ try: except: from sets import Set as set -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/GrampsDb/_WriteGrdb.py b/src/GrampsDb/_WriteGrdb.py index 2943e7019..d0691047d 100644 --- a/src/GrampsDb/_WriteGrdb.py +++ b/src/GrampsDb/_WriteGrdb.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/GrampsDb/_WriteXML.py b/src/GrampsDb/_WriteXML.py index 4f85b3192..e69d4ec9a 100644 --- a/src/GrampsDb/_WriteXML.py +++ b/src/GrampsDb/_WriteXML.py @@ -34,7 +34,7 @@ import time import shutil import os import codecs -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/GrampsLogger/_ErrorReportAssistant.py b/src/GrampsLogger/_ErrorReportAssistant.py index 82d400d12..099448ca9 100644 --- a/src/GrampsLogger/_ErrorReportAssistant.py +++ b/src/GrampsLogger/_ErrorReportAssistant.py @@ -1,4 +1,4 @@ -from TransUtils import sgettext as _ +from gettext import gettext as _ import sys,os import const diff --git a/src/GrampsLogger/_ErrorView.py b/src/GrampsLogger/_ErrorView.py index 7109c0599..83147fda6 100644 --- a/src/GrampsLogger/_ErrorView.py +++ b/src/GrampsLogger/_ErrorView.py @@ -1,4 +1,4 @@ -from TransUtils import sgettext as _ +from gettext import gettext as _ import gtk diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py index ddd78726d..7c89454fe 100644 --- a/src/GrampsWidgets.py +++ b/src/GrampsWidgets.py @@ -23,7 +23,7 @@ import cgi import locale import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/MergeData.py b/src/MergeData.py index 601abb12b..94450d824 100644 --- a/src/MergeData.py +++ b/src/MergeData.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/MergePeople.py b/src/MergePeople.py index bc0a5d147..f4afa51ce 100644 --- a/src/MergePeople.py +++ b/src/MergePeople.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import sets #------------------------------------------------------------------------- diff --git a/src/Mime/_GnomeMime.py b/src/Mime/_GnomeMime.py index 736371c35..b37cc4c97 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 TransUtils import sgettext as _ +from gettext import gettext as _ def get_application(type): """Returns the application command and application name of the diff --git a/src/Mime/_PythonMime.py b/src/Mime/_PythonMime.py index 0c222f366..150b5c474 100644 --- a/src/Mime/_PythonMime.py +++ b/src/Mime/_PythonMime.py @@ -21,7 +21,7 @@ import mimetypes import const import gtk -from TransUtils import sgettext as _ +from gettext import gettext as _ _type_map = { 'application/x-gramps' : 'GRAMPS database', diff --git a/src/ObjectSelector/_ObjectSelectorWindow.py b/src/ObjectSelector/_ObjectSelectorWindow.py index 35b4fec49..4c6e9a77b 100644 --- a/src/ObjectSelector/_ObjectSelectorWindow.py +++ b/src/ObjectSelector/_ObjectSelectorWindow.py @@ -29,7 +29,7 @@ sys.path.append("ObjectSelector") import os.path import gtk import gobject -from TransUtils import sgettext as _ +from gettext import gettext as _ import _Factories from _Constants import ObjectTypes diff --git a/src/ObjectSelector/_PersonFilterFrame.py b/src/ObjectSelector/_PersonFilterFrame.py index 0ab2ed3ae..e5baf60c0 100644 --- a/src/ObjectSelector/_PersonFilterFrame.py +++ b/src/ObjectSelector/_PersonFilterFrame.py @@ -22,7 +22,7 @@ import gtk import gobject -from TransUtils import sgettext as _ +from gettext import gettext as _ from logging import getLogger log = getLogger(".ObjectSelector") diff --git a/src/ObjectSelector/_PersonTreeFrame.py b/src/ObjectSelector/_PersonTreeFrame.py index f4a730277..4c339a6b3 100644 --- a/src/ObjectSelector/_PersonTreeFrame.py +++ b/src/ObjectSelector/_PersonTreeFrame.py @@ -20,7 +20,7 @@ # $Id$ -from TransUtils import sgettext as _ +from gettext import gettext as _ import gtk import gobject diff --git a/src/ObjectSelector/__init__.py b/src/ObjectSelector/__init__.py index 5bd16f65c..6c8809763 100644 --- a/src/ObjectSelector/__init__.py +++ b/src/ObjectSelector/__init__.py @@ -93,7 +93,7 @@ At runtime Object selector is constructed from these widgets in the following st ------------------------------------------------------------------------------- """ -from TransUtils import sgettext as _ +from gettext import gettext as _ from _ObjectSelectorWindow import ObjectSelectorWindow from _Constants import ObjectTypes diff --git a/src/PageView.py b/src/PageView.py index bb8b484b6..01978ea96 100644 --- a/src/PageView.py +++ b/src/PageView.py @@ -25,7 +25,7 @@ # python # #---------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import cPickle as pickle #---------------------------------------------------------------- diff --git a/src/PeopleModel.py b/src/PeopleModel.py index ef6acc393..89000a81d 100644 --- a/src/PeopleModel.py +++ b/src/PeopleModel.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import time import cgi import sys diff --git a/src/PluginUtils/_Options.py b/src/PluginUtils/_Options.py index 63f6a365e..8ea252766 100644 --- a/src/PluginUtils/_Options.py +++ b/src/PluginUtils/_Options.py @@ -31,7 +31,7 @@ General option handling, including saving and parsing. # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/PluginUtils/_PaperMenu.py b/src/PluginUtils/_PaperMenu.py index d8af6ade7..c2894b2aa 100644 --- a/src/PluginUtils/_PaperMenu.py +++ b/src/PluginUtils/_PaperMenu.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/PluginUtils/_PluginMgr.py b/src/PluginUtils/_PluginMgr.py index 78f39d15c..1318580f4 100644 --- a/src/PluginUtils/_PluginMgr.py +++ b/src/PluginUtils/_PluginMgr.py @@ -36,7 +36,7 @@ importers, exporters, and document generators. import os import sys import re -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/PluginUtils/_Plugins.py b/src/PluginUtils/_Plugins.py index 8ad17ef12..287770695 100644 --- a/src/PluginUtils/_Plugins.py +++ b/src/PluginUtils/_Plugins.py @@ -46,7 +46,7 @@ import traceback import os import sys import re -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/PluginUtils/_Report.py b/src/PluginUtils/_Report.py index b457c2d53..9ad46b7b8 100644 --- a/src/PluginUtils/_Report.py +++ b/src/PluginUtils/_Report.py @@ -32,7 +32,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ from types import ClassType, InstanceType import logging diff --git a/src/PluginUtils/_ReportOptions.py b/src/PluginUtils/_ReportOptions.py index 4e9ef82b0..e575502ac 100644 --- a/src/PluginUtils/_ReportOptions.py +++ b/src/PluginUtils/_ReportOptions.py @@ -30,7 +30,7 @@ Report option handling, including saving and parsing. # Standard Python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ import os #------------------------------------------------------------------------- # diff --git a/src/PluginUtils/_ReportUtils.py b/src/PluginUtils/_ReportUtils.py index e9b69b7af..d76a55bcc 100644 --- a/src/PluginUtils/_ReportUtils.py +++ b/src/PluginUtils/_ReportUtils.py @@ -32,7 +32,7 @@ A collection of utilities to aid in the generation of reports. #------------------------------------------------------------------------- import time import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/PluginUtils/_StyleEditor.py b/src/PluginUtils/_StyleEditor.py index 8d24251a9..cb2de16a6 100644 --- a/src/PluginUtils/_StyleEditor.py +++ b/src/PluginUtils/_StyleEditor.py @@ -32,7 +32,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/PluginUtils/_Tool.py b/src/PluginUtils/_Tool.py index 5ff095b4c..2cdb35263 100644 --- a/src/PluginUtils/_Tool.py +++ b/src/PluginUtils/_Tool.py @@ -31,7 +31,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- from types import ClassType, InstanceType -from TransUtils import sgettext as _ +from gettext import gettext as _ import logging log = logging.getLogger(".") diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py index 4b4f40ed1..d2dd67ed6 100644 --- a/src/QuestionDialog.py +++ b/src/QuestionDialog.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/RelLib/_Date.py b/src/RelLib/_Date.py index 99944c06e..783987664 100644 --- a/src/RelLib/_Date.py +++ b/src/RelLib/_Date.py @@ -25,7 +25,7 @@ __author__ = "Donald N. Allingham" __version__ = "$Revision$" -from TransUtils import sgettext as _ +from gettext import gettext as _ from _CalSdn import * #------------------------------------------------------------------------- diff --git a/src/ScratchPad.py b/src/ScratchPad.py index c33b32d0a..fbfabb75d 100644 --- a/src/ScratchPad.py +++ b/src/ScratchPad.py @@ -28,7 +28,7 @@ import cPickle as pickle import os from xml.sax.saxutils import escape -from TransUtils import sgettext as _ +from gettext import gettext as _ import Utils import RelLib from time import strftime as strftime diff --git a/src/SelectEvent.py b/src/SelectEvent.py index 2e73b8534..6f09e9a6f 100644 --- a/src/SelectEvent.py +++ b/src/SelectEvent.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/SelectFamily.py b/src/SelectFamily.py index f6e5e8366..3406f5356 100644 --- a/src/SelectFamily.py +++ b/src/SelectFamily.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/SelectObject.py b/src/SelectObject.py index c0fc78564..6eaa2c022 100644 --- a/src/SelectObject.py +++ b/src/SelectObject.py @@ -37,7 +37,7 @@ import gc # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/SelectPerson.py b/src/SelectPerson.py index 6389fd739..be46f46fc 100644 --- a/src/SelectPerson.py +++ b/src/SelectPerson.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/SelectSource.py b/src/SelectSource.py index 4a4d3845c..e860cf13e 100644 --- a/src/SelectSource.py +++ b/src/SelectSource.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/Spell.py b/src/Spell.py index e30753a81..9185748d7 100644 --- a/src/Spell.py +++ b/src/Spell.py @@ -29,7 +29,7 @@ present, we default to no spell checking. import Config -from TransUtils import sgettext as _ +from gettext import gettext as _ #----------------------------------------------------------- # diff --git a/src/StartupDialog.py b/src/StartupDialog.py index 46e107559..739ada963 100644 --- a/src/StartupDialog.py +++ b/src/StartupDialog.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/TipOfDay.py b/src/TipOfDay.py index 0c1edf22a..fed7dd34d 100644 --- a/src/TipOfDay.py +++ b/src/TipOfDay.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- from xml.parsers.expat import ParserCreate from random import Random -from TransUtils import sgettext as _ +from gettext import gettext as _ import os #------------------------------------------------------------------------- diff --git a/src/TreeViews/_PersonTreeView.py b/src/TreeViews/_PersonTreeView.py index 9a1bb1867..9c0f20764 100644 --- a/src/TreeViews/_PersonTreeView.py +++ b/src/TreeViews/_PersonTreeView.py @@ -1,5 +1,5 @@ -from TransUtils import sgettext as _ +from gettext import gettext as _ import cgi import gtk diff --git a/src/Utils.py b/src/Utils.py index 8e856bb76..9fdaf9ea6 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -31,7 +31,7 @@ import locale import random import time -from TransUtils import sgettext as _ +from gettext import gettext as _ try: set() diff --git a/src/ViewManager.py b/src/ViewManager.py index 1a57f64d5..5223c3e1e 100644 --- a/src/ViewManager.py +++ b/src/ViewManager.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ from bsddb import db import os from cStringIO import StringIO diff --git a/src/docgen/AbiWord2Doc.py b/src/docgen/AbiWord2Doc.py index 3b9b6bc4b..77bad3394 100644 --- a/src/docgen/AbiWord2Doc.py +++ b/src/docgen/AbiWord2Doc.py @@ -31,7 +31,7 @@ Provides a BaseDoc based interface to the AbiWord document format. #------------------------------------------------------------------------- import base64 import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/docgen/AsciiDoc.py b/src/docgen/AsciiDoc.py index 66760d929..ef0ddfa38 100644 --- a/src/docgen/AsciiDoc.py +++ b/src/docgen/AsciiDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/HtmlDoc.py b/src/docgen/HtmlDoc.py index 40a86a0f6..0edb718ac 100644 --- a/src/docgen/HtmlDoc.py +++ b/src/docgen/HtmlDoc.py @@ -28,7 +28,7 @@ import os import re import time -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/KwordDoc.py b/src/docgen/KwordDoc.py index 001af0d50..563f7181b 100644 --- a/src/docgen/KwordDoc.py +++ b/src/docgen/KwordDoc.py @@ -29,7 +29,7 @@ import time import cStringIO import gzip import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/LPRDoc.py b/src/docgen/LPRDoc.py index 79001f0a5..3b7070af7 100644 --- a/src/docgen/LPRDoc.py +++ b/src/docgen/LPRDoc.py @@ -34,7 +34,7 @@ # #------------------------------------------------------------------------ from string import punctuation -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/LaTeXDoc.py b/src/docgen/LaTeXDoc.py index 2f37332b6..be725d0f5 100644 --- a/src/docgen/LaTeXDoc.py +++ b/src/docgen/LaTeXDoc.py @@ -33,7 +33,7 @@ # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py index 7add67729..09641cc74 100644 --- a/src/docgen/ODFDoc.py +++ b/src/docgen/ODFDoc.py @@ -53,7 +53,7 @@ import Mime # internationalization # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ from xml.sax.saxutils import escape _apptype = 'application/vnd.oasis.opendocument.text' diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py index dcb0aba04..c6eeb583c 100644 --- a/src/docgen/OpenOfficeDoc.py +++ b/src/docgen/OpenOfficeDoc.py @@ -31,7 +31,7 @@ import time import locale from cStringIO import StringIO from math import pi, cos, sin, fabs -from TransUtils import sgettext as _ +from gettext import gettext as _ from xml.sax.saxutils import escape #------------------------------------------------------------------------- diff --git a/src/docgen/OpenSpreadSheet.py b/src/docgen/OpenSpreadSheet.py index 42e606636..c6318e40b 100644 --- a/src/docgen/OpenSpreadSheet.py +++ b/src/docgen/OpenSpreadSheet.py @@ -28,7 +28,7 @@ import os import tempfile import zipfile -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/docgen/PSDrawDoc.py b/src/docgen/PSDrawDoc.py index eb17b99e2..bcc03016b 100644 --- a/src/docgen/PSDrawDoc.py +++ b/src/docgen/PSDrawDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- from math import pi, cos, sin -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/docgen/PdfDoc.py b/src/docgen/PdfDoc.py index 1bb43d0cc..0c63449f0 100644 --- a/src/docgen/PdfDoc.py +++ b/src/docgen/PdfDoc.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/RTFDoc.py b/src/docgen/RTFDoc.py index cff1e48c2..abd4cbd2d 100644 --- a/src/docgen/RTFDoc.py +++ b/src/docgen/RTFDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/docgen/SvgDrawDoc.py b/src/docgen/SvgDrawDoc.py index 7156dd679..007ff5a34 100644 --- a/src/docgen/SvgDrawDoc.py +++ b/src/docgen/SvgDrawDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- from math import pi, cos, sin, fabs -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gramps_main.py b/src/gramps_main.py index aca780a73..8f6f97c1c 100644 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -46,7 +46,7 @@ import TipOfDay import DataViews from Mime import mime_type_is_defined from QuestionDialog import ErrorDialog -from TransUtils import sgettext as _ +from gettext import gettext as _ iconpaths = [const.image_dir,"."] diff --git a/src/lds.py b/src/lds.py index 496589a10..694b0af19 100644 --- a/src/lds.py +++ b/src/lds.py @@ -27,7 +27,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/AncestorChart.py b/src/plugins/AncestorChart.py index 957afc18b..c8698fb58 100644 --- a/src/plugins/AncestorChart.py +++ b/src/plugins/AncestorChart.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/AncestorChart2.py b/src/plugins/AncestorChart2.py index 987785cc3..60e88467c 100644 --- a/src/plugins/AncestorChart2.py +++ b/src/plugins/AncestorChart2.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index edffccede..41fa8832a 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Ancestors.py b/src/plugins/Ancestors.py index 110f42c67..3f5cb3797 100644 --- a/src/plugins/Ancestors.py +++ b/src/plugins/Ancestors.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import os #------------------------------------------------------------------------ diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 1657931a3..498028109 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Calendar.py b/src/plugins/Calendar.py index 947dbada3..e6bd30679 100644 --- a/src/plugins/Calendar.py +++ b/src/plugins/Calendar.py @@ -25,7 +25,7 @@ __version__ = "$Revision$" # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import datetime, time from xml.parsers import expat import const diff --git a/src/plugins/ChangeNames.py b/src/plugins/ChangeNames.py index 12449d597..21f91eaeb 100644 --- a/src/plugins/ChangeNames.py +++ b/src/plugins/ChangeNames.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import re -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/ChangeTypes.py b/src/plugins/ChangeTypes.py index ba9836c91..c412a71ed 100644 --- a/src/plugins/ChangeTypes.py +++ b/src/plugins/ChangeTypes.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Check.py b/src/plugins/Check.py index 4a1cdb0cf..9b3aa654d 100644 --- a/src/plugins/Check.py +++ b/src/plugins/Check.py @@ -30,7 +30,7 @@ import os import cStringIO import sets -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Checkpoint.py b/src/plugins/Checkpoint.py index d4e500bf1..a1f02e824 100644 --- a/src/plugins/Checkpoint.py +++ b/src/plugins/Checkpoint.py @@ -31,7 +31,7 @@ import os import popen2 import locale import time -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/CmdRef.py b/src/plugins/CmdRef.py index 2c34b9485..1bba732d1 100644 --- a/src/plugins/CmdRef.py +++ b/src/plugins/CmdRef.py @@ -30,7 +30,7 @@ import os import tempfile from cgi import escape -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/CountAncestors.py b/src/plugins/CountAncestors.py index a65ac5129..b1bfc3938 100644 --- a/src/plugins/CountAncestors.py +++ b/src/plugins/CountAncestors.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ from sets import Set #------------------------------------------------------------------------ diff --git a/src/plugins/CustomBookText.py b/src/plugins/CustomBookText.py index cdec3337e..fd2ce03ca 100644 --- a/src/plugins/CustomBookText.py +++ b/src/plugins/CustomBookText.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/DesGraph.py b/src/plugins/DesGraph.py index a0cdf3407..468f20489 100644 --- a/src/plugins/DesGraph.py +++ b/src/plugins/DesGraph.py @@ -27,7 +27,7 @@ # standard python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py index 100fc47a2..0352b5eff 100644 --- a/src/plugins/Desbrowser.py +++ b/src/plugins/Desbrowser.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/DescendChart.py b/src/plugins/DescendChart.py index c78ca605c..2aa7797d5 100644 --- a/src/plugins/DescendChart.py +++ b/src/plugins/DescendChart.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py index d92f83ca7..83ecef10b 100644 --- a/src/plugins/DescendReport.py +++ b/src/plugins/DescendReport.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index adee00894..d96ea4486 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -28,7 +28,7 @@ # standard python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import cStringIO #------------------------------------------------------------------------ diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index ff24369af..a60a1a3aa 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -28,7 +28,7 @@ # standard python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ import cStringIO #------------------------------------------------------------------------ diff --git a/src/plugins/Eval.py b/src/plugins/Eval.py index dffa6dac9..f74b1becd 100644 --- a/src/plugins/Eval.py +++ b/src/plugins/Eval.py @@ -31,7 +31,7 @@ Provides a python evaluation window import os import cStringIO import sys -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py index 24f62cb9b..1c05e731e 100644 --- a/src/plugins/EventCmp.py +++ b/src/plugins/EventCmp.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/ExportVCalendar.py b/src/plugins/ExportVCalendar.py index cb4247145..37d1b435e 100644 --- a/src/plugins/ExportVCalendar.py +++ b/src/plugins/ExportVCalendar.py @@ -56,7 +56,7 @@ import const import Utils from RelLib import Date import Errors -from TransUtils import sgettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog from PluginUtils import register_export diff --git a/src/plugins/ExportVCard.py b/src/plugins/ExportVCard.py index 2cada851d..828e451c7 100644 --- a/src/plugins/ExportVCard.py +++ b/src/plugins/ExportVCard.py @@ -54,7 +54,7 @@ import GenericFilter import const from RelLib import Date import Errors -from TransUtils import sgettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog from PluginUtils import register_export diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 97cdf4cef..ea2726ddc 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/FanChart.py b/src/plugins/FanChart.py index 08fbfc629..84ae36a0e 100644 --- a/src/plugins/FanChart.py +++ b/src/plugins/FanChart.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------ -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/FilterEditor.py b/src/plugins/FilterEditor.py index 9e999fcac..12226dd1a 100644 --- a/src/plugins/FilterEditor.py +++ b/src/plugins/FilterEditor.py @@ -30,7 +30,7 @@ __author__ = "Don Allingham" # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py index d0322cd4d..7a3a15f03 100644 --- a/src/plugins/FtmStyleAncestors.py +++ b/src/plugins/FtmStyleAncestors.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index d097a8ffd..8aff65523 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py index 4ad8b19ed..102a0940f 100644 --- a/src/plugins/GraphViz.py +++ b/src/plugins/GraphViz.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ from time import asctime #------------------------------------------------------------------------ diff --git a/src/plugins/ImportGeneWeb.py b/src/plugins/ImportGeneWeb.py index d1af108a5..27665d37c 100644 --- a/src/plugins/ImportGeneWeb.py +++ b/src/plugins/ImportGeneWeb.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import re import time -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/ImportvCard.py b/src/plugins/ImportvCard.py index 1284ebb55..b3477cfed 100644 --- a/src/plugins/ImportvCard.py +++ b/src/plugins/ImportvCard.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import re import time -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index 8ef972380..b4b18906d 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py index 88afd1bd8..12d44fd93 100644 --- a/src/plugins/IndivSummary.py +++ b/src/plugins/IndivSummary.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Leak.py b/src/plugins/Leak.py index f63a2f48a..29f946561 100644 --- a/src/plugins/Leak.py +++ b/src/plugins/Leak.py @@ -30,7 +30,7 @@ Show uncollected objects in a window. # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ from bsddb.db import DBError #------------------------------------------------------------------------ diff --git a/src/plugins/Merge.py b/src/plugins/Merge.py index 338c44531..2a3f28063 100644 --- a/src/plugins/Merge.py +++ b/src/plugins/Merge.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/NavWebPage.py b/src/plugins/NavWebPage.py index 327a7f587..405b4cd7a 100644 --- a/src/plugins/NavWebPage.py +++ b/src/plugins/NavWebPage.py @@ -36,7 +36,7 @@ import locale import shutil import codecs import tarfile -from TransUtils import sgettext as _ +from gettext import gettext as _ from cStringIO import StringIO try: diff --git a/src/plugins/PHPGedViewConnector.py b/src/plugins/PHPGedViewConnector.py index cdce74eb5..6675deb81 100644 --- a/src/plugins/PHPGedViewConnector.py +++ b/src/plugins/PHPGedViewConnector.py @@ -31,7 +31,7 @@ import os from random import randint from tempfile import NamedTemporaryFile from tempfile import mkstemp -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_tool # # Interface to phpGedView diff --git a/src/plugins/PatchNames.py b/src/plugins/PatchNames.py index dbac57f20..5d895130c 100644 --- a/src/plugins/PatchNames.py +++ b/src/plugins/PatchNames.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import re -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/ReadPkg.py b/src/plugins/ReadPkg.py index 6957640ee..b5ca57e2e 100644 --- a/src/plugins/ReadPkg.py +++ b/src/plugins/ReadPkg.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------- import os import tarfile -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Rebuild.py b/src/plugins/Rebuild.py index 5531c63dc..e75918a9c 100644 --- a/src/plugins/Rebuild.py +++ b/src/plugins/Rebuild.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import cStringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/RelCalc.py b/src/plugins/RelCalc.py index 1b10b468e..9978bbf93 100644 --- a/src/plugins/RelCalc.py +++ b/src/plugins/RelCalc.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/ReorderIds.py b/src/plugins/ReorderIds.py index 339b1b14c..339d79ac5 100644 --- a/src/plugins/ReorderIds.py +++ b/src/plugins/ReorderIds.py @@ -31,7 +31,7 @@ scheme specified in the database's prefix ids # #------------------------------------------------------------------------ import re -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/SoundGen.py b/src/plugins/SoundGen.py index fe5a5899a..933a7fdd2 100644 --- a/src/plugins/SoundGen.py +++ b/src/plugins/SoundGen.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/Summary.py b/src/plugins/Summary.py index 8813636d5..2a499a00e 100644 --- a/src/plugins/Summary.py +++ b/src/plugins/Summary.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------ import os import posixpath -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/TestcaseGenerator.py b/src/plugins/TestcaseGenerator.py index 709a89c02..2817dc4ee 100644 --- a/src/plugins/TestcaseGenerator.py +++ b/src/plugins/TestcaseGenerator.py @@ -31,7 +31,7 @@ import traceback import sys from random import randint,choice -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/Verify.py b/src/plugins/Verify.py index 9f8eae960..134cbb38f 100644 --- a/src/plugins/Verify.py +++ b/src/plugins/Verify.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/WriteCD.py b/src/plugins/WriteCD.py index eb3973632..b63bb8fdb 100644 --- a/src/plugins/WriteCD.py +++ b/src/plugins/WriteCD.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os from cStringIO import StringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/WriteFtree.py b/src/plugins/WriteFtree.py index 013c2ae55..996ed9214 100644 --- a/src/plugins/WriteFtree.py +++ b/src/plugins/WriteFtree.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os from cStringIO import StringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/WriteGeneWeb.py b/src/plugins/WriteGeneWeb.py index 3646adebc..3bd560ccc 100644 --- a/src/plugins/WriteGeneWeb.py +++ b/src/plugins/WriteGeneWeb.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/WritePkg.py b/src/plugins/WritePkg.py index 809af8493..07132f21c 100644 --- a/src/plugins/WritePkg.py +++ b/src/plugins/WritePkg.py @@ -31,7 +31,7 @@ import time import os import tarfile from cStringIO import StringIO -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/src/plugins/rel_da.py b/src/plugins/rel_da.py index 1c1557b4c..d25db922b 100644 --- a/src/plugins/rel_da.py +++ b/src/plugins/rel_da.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_de.py b/src/plugins/rel_de.py index 5e08107f0..cb627bb10 100644 --- a/src/plugins/rel_de.py +++ b/src/plugins/rel_de.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_es.py b/src/plugins/rel_es.py index c73ec39df..b3f04e7d3 100644 --- a/src/plugins/rel_es.py +++ b/src/plugins/rel_es.py @@ -32,7 +32,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_fi.py b/src/plugins/rel_fi.py index 2f80f2e58..fffabea82 100644 --- a/src/plugins/rel_fi.py +++ b/src/plugins/rel_fi.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_fr.py b/src/plugins/rel_fr.py index 0c7c6b1f1..bc0b69a58 100644 --- a/src/plugins/rel_fr.py +++ b/src/plugins/rel_fr.py @@ -30,7 +30,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_hu.py b/src/plugins/rel_hu.py index 3883dfd07..ed7cfda3d 100644 --- a/src/plugins/rel_hu.py +++ b/src/plugins/rel_hu.py @@ -34,7 +34,7 @@ import RelLib import Relationship from PluginUtils import register_relcalc import types -from TransUtils import sgettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/plugins/rel_no.py b/src/plugins/rel_no.py index 616db4691..fe6fee999 100644 --- a/src/plugins/rel_no.py +++ b/src/plugins/rel_no.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/src/plugins/rel_sv.py b/src/plugins/rel_sv.py index 60dcc2df4..019dcdd29 100644 --- a/src/plugins/rel_sv.py +++ b/src/plugins/rel_sv.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from TransUtils import sgettext as _ +from gettext import gettext as _ from PluginUtils import register_relcalc #-------------------------------------------------------------------------