From c064cb8185e8f2615be15b5921ebdba7e2bcbae8 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 16 Mar 2006 20:24:27 +0000 Subject: [PATCH] * various: Use TransUtils.sgettext instead of gettext.gettext to work out stripping the context. svn: r6155 --- gramps2/ChangeLog | 2 ++ gramps2/src/AddMedia.py | 2 +- gramps2/src/ArgHandler.py | 2 +- gramps2/src/Assistant.py | 2 +- gramps2/src/Bookmarks.py | 2 +- gramps2/src/ColumnOrder.py | 2 +- gramps2/src/DataViews/_EventView.py | 2 +- gramps2/src/DataViews/_FamilyList.py | 2 +- gramps2/src/DataViews/_FamilyView.py | 2 +- gramps2/src/DataViews/_MapView.py | 2 +- gramps2/src/DataViews/_MediaView.py | 2 +- gramps2/src/DataViews/_PedigreeView.py | 2 +- gramps2/src/DataViews/_PersonView.py | 2 +- gramps2/src/DataViews/_PlaceView.py | 2 +- gramps2/src/DataViews/_RepositoryView.py | 2 +- gramps2/src/DataViews/_SourceView.py | 2 +- gramps2/src/DateEdit.py | 2 +- gramps2/src/DateHandler/_DateDisplay.py | 2 +- gramps2/src/DisplayModels.py | 2 +- gramps2/src/DisplayTabs.py | 2 +- gramps2/src/Editors/_EditAddress.py | 2 +- gramps2/src/Editors/_EditAttribute.py | 2 +- gramps2/src/Editors/_EditEvent.py | 2 +- gramps2/src/Editors/_EditEventRef.py | 2 +- gramps2/src/Editors/_EditFamily.py | 2 +- gramps2/src/Editors/_EditLocation.py | 2 +- gramps2/src/Editors/_EditMedia.py | 2 +- gramps2/src/Editors/_EditMediaRef.py | 2 +- gramps2/src/Editors/_EditName.py | 2 +- gramps2/src/Editors/_EditPerson.py | 2 +- gramps2/src/Editors/_EditPlace.py | 2 +- gramps2/src/Editors/_EditPrimary.py | 2 +- gramps2/src/Editors/_EditReference.py | 2 +- gramps2/src/Editors/_EditRepository.py | 2 +- gramps2/src/Editors/_EditSecondary.py | 2 +- gramps2/src/Editors/_EditSource.py | 2 +- gramps2/src/Editors/_EditSourceRef.py | 2 +- gramps2/src/Editors/_EditUrl.py | 2 +- gramps2/src/Exporter.py | 2 +- gramps2/src/GenericFilter.py | 5 ++-- gramps2/src/GrampsCfg.py | 2 +- gramps2/src/GrampsDb/_GrampsBSDDB.py | 4 ++-- gramps2/src/GrampsDb/_GrampsDbBase.py | 2 +- gramps2/src/GrampsDb/_ReadGedcom.py | 2 +- gramps2/src/GrampsDb/_ReadGrdb.py | 2 +- gramps2/src/GrampsDb/_ReadXML.py | 2 +- gramps2/src/GrampsDb/_WriteGedcom.py | 2 +- gramps2/src/GrampsDb/_WriteGrdb.py | 2 +- gramps2/src/GrampsDb/_WriteXML.py | 2 +- .../src/GrampsLogger/_ErrorReportAssistant.py | 2 +- gramps2/src/GrampsLogger/_ErrorView.py | 2 +- gramps2/src/GrampsWidgets.py | 2 +- gramps2/src/MergeData.py | 2 +- gramps2/src/MergePeople.py | 2 +- gramps2/src/Mime/_GnomeMime.py | 2 +- gramps2/src/Mime/_PythonMime.py | 2 +- .../ObjectSelector/_ObjectSelectorWindow.py | 2 +- .../src/ObjectSelector/_PersonFilterFrame.py | 2 +- .../src/ObjectSelector/_PersonTreeFrame.py | 2 +- gramps2/src/ObjectSelector/__init__.py | 2 +- gramps2/src/PageView.py | 2 +- gramps2/src/PeopleModel.py | 2 +- gramps2/src/PluginUtils/_Options.py | 2 +- gramps2/src/PluginUtils/_PaperMenu.py | 2 +- gramps2/src/PluginUtils/_PluginMgr.py | 2 +- gramps2/src/PluginUtils/_Plugins.py | 2 +- gramps2/src/PluginUtils/_Report.py | 2 +- gramps2/src/PluginUtils/_ReportOptions.py | 2 +- gramps2/src/PluginUtils/_ReportUtils.py | 2 +- gramps2/src/PluginUtils/_StyleEditor.py | 2 +- gramps2/src/PluginUtils/_Tool.py | 2 +- gramps2/src/QuestionDialog.py | 2 +- gramps2/src/RelImage.py | 2 +- gramps2/src/RelLib/_Date.py | 2 +- gramps2/src/Relationship.py | 23 +++++++++---------- gramps2/src/ScratchPad.py | 2 +- gramps2/src/SelectEvent.py | 2 +- gramps2/src/SelectObject.py | 2 +- gramps2/src/SelectPerson.py | 2 +- gramps2/src/Spell.py | 2 +- gramps2/src/StartupDialog.py | 2 +- gramps2/src/TipOfDay.py | 2 +- gramps2/src/TransUtils.py | 14 ++++++----- gramps2/src/TreeViews/_PersonTreeView.py | 2 +- gramps2/src/Utils.py | 2 +- gramps2/src/ViewManager.py | 2 +- gramps2/src/docgen/AbiWord2Doc.py | 2 +- gramps2/src/docgen/AsciiDoc.py | 2 +- gramps2/src/docgen/HtmlDoc.py | 2 +- gramps2/src/docgen/KwordDoc.py | 2 +- gramps2/src/docgen/LPRDoc.py | 2 +- gramps2/src/docgen/LaTeXDoc.py | 2 +- gramps2/src/docgen/ODFDoc.py | 2 +- gramps2/src/docgen/OpenOfficeDoc.py | 2 +- gramps2/src/docgen/OpenSpreadSheet.py | 2 +- gramps2/src/docgen/PSDrawDoc.py | 2 +- gramps2/src/docgen/PdfDoc.py | 2 +- gramps2/src/docgen/RTFDoc.py | 2 +- gramps2/src/docgen/SvgDrawDoc.py | 2 +- gramps2/src/plugins/AncestorChart.py | 2 +- gramps2/src/plugins/AncestorChart2.py | 2 +- gramps2/src/plugins/AncestorReport.py | 2 +- gramps2/src/plugins/Ancestors.py | 2 +- gramps2/src/plugins/BookReport.py | 2 +- gramps2/src/plugins/Calendar.py | 2 +- gramps2/src/plugins/ChangeNames.py | 2 +- gramps2/src/plugins/ChangeTypes.py | 2 +- gramps2/src/plugins/Check.py | 2 +- gramps2/src/plugins/Checkpoint.py | 2 +- gramps2/src/plugins/CmdRef.py | 2 +- gramps2/src/plugins/CountAncestors.py | 2 +- gramps2/src/plugins/CustomBookText.py | 2 +- gramps2/src/plugins/DesGraph.py | 2 +- gramps2/src/plugins/Desbrowser.py | 2 +- gramps2/src/plugins/DescendChart.py | 2 +- gramps2/src/plugins/DescendReport.py | 2 +- gramps2/src/plugins/DetAncestralReport.py | 2 +- gramps2/src/plugins/DetDescendantReport.py | 2 +- gramps2/src/plugins/Eval.py | 2 +- gramps2/src/plugins/EventCmp.py | 2 +- gramps2/src/plugins/ExportVCalendar.py | 2 +- gramps2/src/plugins/ExportVCard.py | 2 +- gramps2/src/plugins/FamilyGroup.py | 2 +- gramps2/src/plugins/FanChart.py | 2 +- gramps2/src/plugins/FilterEditor.py | 2 +- gramps2/src/plugins/FtmStyleAncestors.py | 2 +- gramps2/src/plugins/FtmStyleDescendants.py | 2 +- gramps2/src/plugins/GraphViz.py | 2 +- gramps2/src/plugins/ImportGeneWeb.py | 2 +- gramps2/src/plugins/ImportvCard.py | 2 +- gramps2/src/plugins/IndivComplete.py | 2 +- gramps2/src/plugins/IndivSummary.py | 2 +- gramps2/src/plugins/Leak.py | 2 +- gramps2/src/plugins/Merge.py | 2 +- gramps2/src/plugins/NavWebPage.py | 2 +- gramps2/src/plugins/PHPGedViewConnector.py | 2 +- gramps2/src/plugins/PatchNames.py | 2 +- gramps2/src/plugins/ReadPkg.py | 2 +- gramps2/src/plugins/Rebuild.py | 2 +- gramps2/src/plugins/RelCalc.py | 2 +- gramps2/src/plugins/ReorderIds.py | 2 +- gramps2/src/plugins/SimpleBookTitle.py | 5 ++-- gramps2/src/plugins/SoundGen.py | 2 +- gramps2/src/plugins/StatisticsChart.py | 5 ++-- gramps2/src/plugins/Summary.py | 2 +- gramps2/src/plugins/TestcaseGenerator.py | 2 +- gramps2/src/plugins/TimeLine.py | 5 ++-- gramps2/src/plugins/Verify.py | 2 +- gramps2/src/plugins/WriteCD.py | 2 +- gramps2/src/plugins/WriteFtree.py | 2 +- gramps2/src/plugins/WriteGeneWeb.py | 2 +- gramps2/src/plugins/WritePkg.py | 2 +- gramps2/src/plugins/rel_da.py | 2 +- gramps2/src/plugins/rel_de.py | 2 +- gramps2/src/plugins/rel_es.py | 2 +- gramps2/src/plugins/rel_fi.py | 2 +- gramps2/src/plugins/rel_fr.py | 2 +- gramps2/src/plugins/rel_hu.py | 2 +- gramps2/src/plugins/rel_no.py | 2 +- gramps2/src/plugins/rel_sv.py | 2 +- 160 files changed, 183 insertions(+), 184 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d35752527..a1c63c84b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-03-16 Alex Roitman + * various: Use TransUtils.sgettext instead of gettext.gettext to + work out stripping the context. * py-compile: Remove as it is autogenerated. * po/Makefile.in.in: Remove as it is autogenerated. * po/*po: Remove and re-add from old src/po to keep history. diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py index 707f60181..669bbba8f 100644 --- a/gramps2/src/AddMedia.py +++ b/gramps2/src/AddMedia.py @@ -37,7 +37,7 @@ import os # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/ArgHandler.py b/gramps2/src/ArgHandler.py index b319a1811..516f5bf15 100644 --- a/gramps2/src/ArgHandler.py +++ b/gramps2/src/ArgHandler.py @@ -33,7 +33,7 @@ Module responsible for handling the command line arguments for GRAMPS. #------------------------------------------------------------------------- import os import getopt -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Assistant.py b/gramps2/src/Assistant.py index 7d08a1107..4ba5d68bd 100644 --- a/gramps2/src/Assistant.py +++ b/gramps2/src/Assistant.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import os #------------------------------------------------------------------------- diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py index 6acc48fae..4c5a7e095 100644 --- a/gramps2/src/Bookmarks.py +++ b/gramps2/src/Bookmarks.py @@ -30,7 +30,7 @@ __version__ = "$Revision$" # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ from cStringIO import StringIO #------------------------------------------------------------------------- diff --git a/gramps2/src/ColumnOrder.py b/gramps2/src/ColumnOrder.py index a168d148d..1e384f227 100644 --- a/gramps2/src/ColumnOrder.py +++ b/gramps2/src/ColumnOrder.py @@ -29,7 +29,7 @@ import gtk.glade import gc import const -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/DataViews/_EventView.py b/gramps2/src/DataViews/_EventView.py index a0134d22e..c84cb08b4 100644 --- a/gramps2/src/DataViews/_EventView.py +++ b/gramps2/src/DataViews/_EventView.py @@ -45,7 +45,7 @@ from Editors import EditEvent, DelEventQuery # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('Description'), diff --git a/gramps2/src/DataViews/_FamilyList.py b/gramps2/src/DataViews/_FamilyList.py index a7f49c38e..af084d262 100644 --- a/gramps2/src/DataViews/_FamilyList.py +++ b/gramps2/src/DataViews/_FamilyList.py @@ -45,7 +45,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('ID'), diff --git a/gramps2/src/DataViews/_FamilyView.py b/gramps2/src/DataViews/_FamilyView.py index 39caeed40..1ee782663 100644 --- a/gramps2/src/DataViews/_FamilyView.py +++ b/gramps2/src/DataViews/_FamilyView.py @@ -3,7 +3,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import gc import re import cgi diff --git a/gramps2/src/DataViews/_MapView.py b/gramps2/src/DataViews/_MapView.py index 9b486ae9a..a3beec9c0 100644 --- a/gramps2/src/DataViews/_MapView.py +++ b/gramps2/src/DataViews/_MapView.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import gc import re import logging diff --git a/gramps2/src/DataViews/_MediaView.py b/gramps2/src/DataViews/_MediaView.py index e4377d364..6ce3862aa 100644 --- a/gramps2/src/DataViews/_MediaView.py +++ b/gramps2/src/DataViews/_MediaView.py @@ -44,7 +44,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('Title'), diff --git a/gramps2/src/DataViews/_PedigreeView.py b/gramps2/src/DataViews/_PedigreeView.py index 5c46cf8fa..e65efb682 100644 --- a/gramps2/src/DataViews/_PedigreeView.py +++ b/gramps2/src/DataViews/_PedigreeView.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index c8649b9af..0309f52fd 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import cPickle as pickle #------------------------------------------------------------------------- diff --git a/gramps2/src/DataViews/_PlaceView.py b/gramps2/src/DataViews/_PlaceView.py index 2f4060f12..ff9164d61 100644 --- a/gramps2/src/DataViews/_PlaceView.py +++ b/gramps2/src/DataViews/_PlaceView.py @@ -46,7 +46,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('Place Name'), diff --git a/gramps2/src/DataViews/_RepositoryView.py b/gramps2/src/DataViews/_RepositoryView.py index 97452d938..bc5ced87a 100644 --- a/gramps2/src/DataViews/_RepositoryView.py +++ b/gramps2/src/DataViews/_RepositoryView.py @@ -46,7 +46,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('Name'), diff --git a/gramps2/src/DataViews/_SourceView.py b/gramps2/src/DataViews/_SourceView.py index 85c39ab57..48607dd8d 100644 --- a/gramps2/src/DataViews/_SourceView.py +++ b/gramps2/src/DataViews/_SourceView.py @@ -46,7 +46,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ column_names = [ _('Title'), diff --git a/gramps2/src/DateEdit.py b/gramps2/src/DateEdit.py index 7b1d6df72..dfe127c86 100644 --- a/gramps2/src/DateEdit.py +++ b/gramps2/src/DateEdit.py @@ -41,7 +41,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import gc #------------------------------------------------------------------------- diff --git a/gramps2/src/DateHandler/_DateDisplay.py b/gramps2/src/DateHandler/_DateDisplay.py index e4cbe1325..e686d6dfe 100644 --- a/gramps2/src/DateHandler/_DateDisplay.py +++ b/gramps2/src/DateHandler/_DateDisplay.py @@ -33,7 +33,7 @@ __version__ = "$Revision$" # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/DisplayModels.py b/gramps2/src/DisplayModels.py index 797a6fd7b..5ec7df439 100644 --- a/gramps2/src/DisplayModels.py +++ b/gramps2/src/DisplayModels.py @@ -25,7 +25,7 @@ # #------------------------------------------------------------------------- import time -from gettext import gettext as _ +from TransUtils import sgettext as _ import locale import logging diff --git a/gramps2/src/DisplayTabs.py b/gramps2/src/DisplayTabs.py index 77e021508..281ae8a39 100644 --- a/gramps2/src/DisplayTabs.py +++ b/gramps2/src/DisplayTabs.py @@ -34,7 +34,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import pickle try: diff --git a/gramps2/src/Editors/_EditAddress.py b/gramps2/src/Editors/_EditAddress.py index afcec1672..84a86845a 100644 --- a/gramps2/src/Editors/_EditAddress.py +++ b/gramps2/src/Editors/_EditAddress.py @@ -30,7 +30,7 @@ mechanism for the user to edit address information. # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditAttribute.py b/gramps2/src/Editors/_EditAttribute.py index 0a39b217b..cec31d100 100644 --- a/gramps2/src/Editors/_EditAttribute.py +++ b/gramps2/src/Editors/_EditAttribute.py @@ -33,7 +33,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditEvent.py b/gramps2/src/Editors/_EditEvent.py index b9342686b..c8f4703bd 100644 --- a/gramps2/src/Editors/_EditEvent.py +++ b/gramps2/src/Editors/_EditEvent.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ try: set() diff --git a/gramps2/src/Editors/_EditEventRef.py b/gramps2/src/Editors/_EditEventRef.py index 948771c20..38658bbe5 100644 --- a/gramps2/src/Editors/_EditEventRef.py +++ b/gramps2/src/Editors/_EditEventRef.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ try: set() diff --git a/gramps2/src/Editors/_EditFamily.py b/gramps2/src/Editors/_EditFamily.py index 9fbeda2dc..c0225f70e 100644 --- a/gramps2/src/Editors/_EditFamily.py +++ b/gramps2/src/Editors/_EditFamily.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import cPickle as pickle -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditLocation.py b/gramps2/src/Editors/_EditLocation.py index cbef36450..330a5a662 100644 --- a/gramps2/src/Editors/_EditLocation.py +++ b/gramps2/src/Editors/_EditLocation.py @@ -38,7 +38,7 @@ import Utils from _EditSecondary import EditSecondary from GrampsWidgets import * -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditMedia.py b/gramps2/src/Editors/_EditMedia.py index 54a2166e8..e640043da 100644 --- a/gramps2/src/Editors/_EditMedia.py +++ b/gramps2/src/Editors/_EditMedia.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import os #------------------------------------------------------------------------- diff --git a/gramps2/src/Editors/_EditMediaRef.py b/gramps2/src/Editors/_EditMediaRef.py index b54cc6858..80ab434f2 100644 --- a/gramps2/src/Editors/_EditMediaRef.py +++ b/gramps2/src/Editors/_EditMediaRef.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditName.py b/gramps2/src/Editors/_EditName.py index 2fdbca643..5c62c3265 100644 --- a/gramps2/src/Editors/_EditName.py +++ b/gramps2/src/Editors/_EditName.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditPerson.py b/gramps2/src/Editors/_EditPerson.py index bbfb52ac0..bb2c16ac3 100644 --- a/gramps2/src/Editors/_EditPerson.py +++ b/gramps2/src/Editors/_EditPerson.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- import os import locale -from gettext import gettext as _ +from TransUtils import sgettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/gramps2/src/Editors/_EditPlace.py b/gramps2/src/Editors/_EditPlace.py index b713ffa3e..8620ebef0 100644 --- a/gramps2/src/Editors/_EditPlace.py +++ b/gramps2/src/Editors/_EditPlace.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- import cPickle as pickle -from gettext import gettext as _ +from TransUtils import sgettext as _ import logging log = logging.getLogger(".") diff --git a/gramps2/src/Editors/_EditPrimary.py b/gramps2/src/Editors/_EditPrimary.py index e15155af3..664fe64d0 100644 --- a/gramps2/src/Editors/_EditPrimary.py +++ b/gramps2/src/Editors/_EditPrimary.py @@ -20,7 +20,7 @@ # $Id$ -from gettext import gettext as _ +from TransUtils import sgettext as _ import DisplayState import DateHandler diff --git a/gramps2/src/Editors/_EditReference.py b/gramps2/src/Editors/_EditReference.py index 877e8200b..e30252d0f 100644 --- a/gramps2/src/Editors/_EditReference.py +++ b/gramps2/src/Editors/_EditReference.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ try: set() diff --git a/gramps2/src/Editors/_EditRepository.py b/gramps2/src/Editors/_EditRepository.py index b6f716eea..3741e97d4 100644 --- a/gramps2/src/Editors/_EditRepository.py +++ b/gramps2/src/Editors/_EditRepository.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Editors/_EditSecondary.py b/gramps2/src/Editors/_EditSecondary.py index 6f95b5e06..797feedf2 100644 --- a/gramps2/src/Editors/_EditSecondary.py +++ b/gramps2/src/Editors/_EditSecondary.py @@ -20,7 +20,7 @@ # $Id$ -from gettext import gettext as _ +from TransUtils import sgettext as _ import DisplayState import Config diff --git a/gramps2/src/Editors/_EditSource.py b/gramps2/src/Editors/_EditSource.py index 219dbbc0b..44a92fe17 100644 --- a/gramps2/src/Editors/_EditSource.py +++ b/gramps2/src/Editors/_EditSource.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import logging log = logging.getLogger(".") diff --git a/gramps2/src/Editors/_EditSourceRef.py b/gramps2/src/Editors/_EditSourceRef.py index f68518b1f..ff30a582b 100644 --- a/gramps2/src/Editors/_EditSourceRef.py +++ b/gramps2/src/Editors/_EditSourceRef.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ try: set() diff --git a/gramps2/src/Editors/_EditUrl.py b/gramps2/src/Editors/_EditUrl.py index e1640de84..3a6f52aca 100644 --- a/gramps2/src/Editors/_EditUrl.py +++ b/gramps2/src/Editors/_EditUrl.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ from cgi import escape #------------------------------------------------------------------------- diff --git a/gramps2/src/Exporter.py b/gramps2/src/Exporter.py index 751078073..ff3b2d287 100644 --- a/gramps2/src/Exporter.py +++ b/gramps2/src/Exporter.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index c0ee0d164..ccc1e160a 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -38,7 +38,7 @@ from xml.sax import make_parser,handler,SAXParseException #------------------------------------------------------------------------- import os import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # @@ -64,7 +64,6 @@ import const import RelLib import DateHandler import NameDisplay -from TransUtils import strip_context as __ from Utils import for_each_ancestor,probably_alive,get_source_referents #------------------------------------------------------------------------- @@ -1303,7 +1302,7 @@ class HasNameOf(Rule): labels = [ _('Given name:'), _('Family name:'), _('Suffix:'), - __('person|Title:')] + _('person|Title:')] name = _('People with the ') description = _("Matches people with a specified (partial) name") category = _('General filters') diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index 09d129209..1b61ef611 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- import os import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/GrampsDb/_GrampsBSDDB.py b/gramps2/src/GrampsDb/_GrampsBSDDB.py index 76de41298..ce5119c33 100644 --- a/gramps2/src/GrampsDb/_GrampsBSDDB.py +++ b/gramps2/src/GrampsDb/_GrampsBSDDB.py @@ -34,7 +34,7 @@ import os import time import locale import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ from bsddb import dbshelve, db import logging log = logging.getLogger(".GrampsDb") @@ -120,7 +120,7 @@ class GrampsBSDDB(GrampsDbBase): """GRAMPS database object. This object is a base class for other objects.""" - UseTXN = False + UseTXN = True def __init__(self): """creates a new GrampsDB""" diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py index 8d32bebf7..96ad8726d 100644 --- a/gramps2/src/GrampsDb/_GrampsDbBase.py +++ b/gramps2/src/GrampsDb/_GrampsDbBase.py @@ -37,7 +37,7 @@ import locale import re from sys import maxint import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ import logging log = logging.getLogger(".GrampsDb") diff --git a/gramps2/src/GrampsDb/_ReadGedcom.py b/gramps2/src/GrampsDb/_ReadGedcom.py index b5f0e8d3a..db7201bfe 100644 --- a/gramps2/src/GrampsDb/_ReadGedcom.py +++ b/gramps2/src/GrampsDb/_ReadGedcom.py @@ -33,7 +33,7 @@ import string import const import time -from gettext import gettext as _ +from TransUtils import sgettext as _ # and module sets for earlier pythons try: diff --git a/gramps2/src/GrampsDb/_ReadGrdb.py b/gramps2/src/GrampsDb/_ReadGrdb.py index 04d95e025..52d0a2e03 100644 --- a/gramps2/src/GrampsDb/_ReadGrdb.py +++ b/gramps2/src/GrampsDb/_ReadGrdb.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ import sets #------------------------------------------------------------------------- diff --git a/gramps2/src/GrampsDb/_ReadXML.py b/gramps2/src/GrampsDb/_ReadXML.py index 34350f755..e9d5f486c 100644 --- a/gramps2/src/GrampsDb/_ReadXML.py +++ b/gramps2/src/GrampsDb/_ReadXML.py @@ -29,7 +29,7 @@ import os import sets import shutil from xml.parsers.expat import ExpatError, ParserCreate -from gettext import gettext as _ +from TransUtils import sgettext as _ import re #------------------------------------------------------------------------ diff --git a/gramps2/src/GrampsDb/_WriteGedcom.py b/gramps2/src/GrampsDb/_WriteGedcom.py index 7498fe691..b423e4cf4 100644 --- a/gramps2/src/GrampsDb/_WriteGedcom.py +++ b/gramps2/src/GrampsDb/_WriteGedcom.py @@ -30,7 +30,7 @@ import os import time import re import shutil -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/GrampsDb/_WriteGrdb.py b/gramps2/src/GrampsDb/_WriteGrdb.py index d0691047d..2943e7019 100644 --- a/gramps2/src/GrampsDb/_WriteGrdb.py +++ b/gramps2/src/GrampsDb/_WriteGrdb.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/GrampsDb/_WriteXML.py b/gramps2/src/GrampsDb/_WriteXML.py index 7109709b7..1eb1b1c8e 100644 --- a/gramps2/src/GrampsDb/_WriteXML.py +++ b/gramps2/src/GrampsDb/_WriteXML.py @@ -34,7 +34,7 @@ import time import shutil import os import codecs -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/GrampsLogger/_ErrorReportAssistant.py b/gramps2/src/GrampsLogger/_ErrorReportAssistant.py index 099448ca9..82d400d12 100644 --- a/gramps2/src/GrampsLogger/_ErrorReportAssistant.py +++ b/gramps2/src/GrampsLogger/_ErrorReportAssistant.py @@ -1,4 +1,4 @@ -from gettext import gettext as _ +from TransUtils import sgettext as _ import sys,os import const diff --git a/gramps2/src/GrampsLogger/_ErrorView.py b/gramps2/src/GrampsLogger/_ErrorView.py index 83147fda6..7109c0599 100644 --- a/gramps2/src/GrampsLogger/_ErrorView.py +++ b/gramps2/src/GrampsLogger/_ErrorView.py @@ -1,4 +1,4 @@ -from gettext import gettext as _ +from TransUtils import sgettext as _ import gtk diff --git a/gramps2/src/GrampsWidgets.py b/gramps2/src/GrampsWidgets.py index e2324b992..f2d476bac 100644 --- a/gramps2/src/GrampsWidgets.py +++ b/gramps2/src/GrampsWidgets.py @@ -23,7 +23,7 @@ import cgi import locale import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index 94450d824..601abb12b 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/src/MergeData.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/MergePeople.py b/gramps2/src/MergePeople.py index 28e148729..6a8a68580 100644 --- a/gramps2/src/MergePeople.py +++ b/gramps2/src/MergePeople.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import sets #------------------------------------------------------------------------- diff --git a/gramps2/src/Mime/_GnomeMime.py b/gramps2/src/Mime/_GnomeMime.py index e37825fa8..e9ae6056f 100644 --- a/gramps2/src/Mime/_GnomeMime.py +++ b/gramps2/src/Mime/_GnomeMime.py @@ -30,7 +30,7 @@ except: from gnome.vfs import mime_get_short_list_applications, \ mime_get_description, get_mime_type -from gettext import gettext as _ +from TransUtils import sgettext as _ def get_application(type): """Returns the application command and application name of the diff --git a/gramps2/src/Mime/_PythonMime.py b/gramps2/src/Mime/_PythonMime.py index 150b5c474..0c222f366 100644 --- a/gramps2/src/Mime/_PythonMime.py +++ b/gramps2/src/Mime/_PythonMime.py @@ -21,7 +21,7 @@ import mimetypes import const import gtk -from gettext import gettext as _ +from TransUtils import sgettext as _ _type_map = { 'application/x-gramps' : 'GRAMPS database', diff --git a/gramps2/src/ObjectSelector/_ObjectSelectorWindow.py b/gramps2/src/ObjectSelector/_ObjectSelectorWindow.py index 0e812a831..39579053d 100644 --- a/gramps2/src/ObjectSelector/_ObjectSelectorWindow.py +++ b/gramps2/src/ObjectSelector/_ObjectSelectorWindow.py @@ -29,7 +29,7 @@ sys.path.append("ObjectSelector") import os.path import gtk import gobject -from gettext import gettext as _ +from TransUtils import sgettext as _ import _Factories from _Constants import ObjectTypes diff --git a/gramps2/src/ObjectSelector/_PersonFilterFrame.py b/gramps2/src/ObjectSelector/_PersonFilterFrame.py index e5baf60c0..0ab2ed3ae 100644 --- a/gramps2/src/ObjectSelector/_PersonFilterFrame.py +++ b/gramps2/src/ObjectSelector/_PersonFilterFrame.py @@ -22,7 +22,7 @@ import gtk import gobject -from gettext import gettext as _ +from TransUtils import sgettext as _ from logging import getLogger log = getLogger(".ObjectSelector") diff --git a/gramps2/src/ObjectSelector/_PersonTreeFrame.py b/gramps2/src/ObjectSelector/_PersonTreeFrame.py index 4c339a6b3..f4a730277 100644 --- a/gramps2/src/ObjectSelector/_PersonTreeFrame.py +++ b/gramps2/src/ObjectSelector/_PersonTreeFrame.py @@ -20,7 +20,7 @@ # $Id$ -from gettext import gettext as _ +from TransUtils import sgettext as _ import gtk import gobject diff --git a/gramps2/src/ObjectSelector/__init__.py b/gramps2/src/ObjectSelector/__init__.py index 6c8809763..5bd16f65c 100644 --- a/gramps2/src/ObjectSelector/__init__.py +++ b/gramps2/src/ObjectSelector/__init__.py @@ -93,7 +93,7 @@ At runtime Object selector is constructed from these widgets in the following st ------------------------------------------------------------------------------- """ -from gettext import gettext as _ +from TransUtils import sgettext as _ from _ObjectSelectorWindow import ObjectSelectorWindow from _Constants import ObjectTypes diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py index 5cdcda34c..0e671dedf 100644 --- a/gramps2/src/PageView.py +++ b/gramps2/src/PageView.py @@ -25,7 +25,7 @@ # python # #---------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #---------------------------------------------------------------- # diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py index 5d69c3435..d5cf06f26 100644 --- a/gramps2/src/PeopleModel.py +++ b/gramps2/src/PeopleModel.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import time import cgi import sys diff --git a/gramps2/src/PluginUtils/_Options.py b/gramps2/src/PluginUtils/_Options.py index 871f5a26a..51976a152 100644 --- a/gramps2/src/PluginUtils/_Options.py +++ b/gramps2/src/PluginUtils/_Options.py @@ -31,7 +31,7 @@ General option handling, including saving and parsing. # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PluginUtils/_PaperMenu.py b/gramps2/src/PluginUtils/_PaperMenu.py index c2894b2aa..d8af6ade7 100644 --- a/gramps2/src/PluginUtils/_PaperMenu.py +++ b/gramps2/src/PluginUtils/_PaperMenu.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PluginUtils/_PluginMgr.py b/gramps2/src/PluginUtils/_PluginMgr.py index 1318580f4..78f39d15c 100644 --- a/gramps2/src/PluginUtils/_PluginMgr.py +++ b/gramps2/src/PluginUtils/_PluginMgr.py @@ -36,7 +36,7 @@ importers, exporters, and document generators. import os import sys import re -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PluginUtils/_Plugins.py b/gramps2/src/PluginUtils/_Plugins.py index bbd5956a5..ba943ae4a 100644 --- a/gramps2/src/PluginUtils/_Plugins.py +++ b/gramps2/src/PluginUtils/_Plugins.py @@ -46,7 +46,7 @@ import traceback import os import sys import re -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PluginUtils/_Report.py b/gramps2/src/PluginUtils/_Report.py index a7c5ef127..63873abd0 100644 --- a/gramps2/src/PluginUtils/_Report.py +++ b/gramps2/src/PluginUtils/_Report.py @@ -32,7 +32,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ from types import ClassType, InstanceType import logging diff --git a/gramps2/src/PluginUtils/_ReportOptions.py b/gramps2/src/PluginUtils/_ReportOptions.py index 43d2344c5..8d188edbc 100644 --- a/gramps2/src/PluginUtils/_ReportOptions.py +++ b/gramps2/src/PluginUtils/_ReportOptions.py @@ -30,7 +30,7 @@ Report option handling, including saving and parsing. # Standard Python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PluginUtils/_ReportUtils.py b/gramps2/src/PluginUtils/_ReportUtils.py index 0e003f9f7..70ae7cbcf 100644 --- a/gramps2/src/PluginUtils/_ReportUtils.py +++ b/gramps2/src/PluginUtils/_ReportUtils.py @@ -32,7 +32,7 @@ A collection of utilities to aid in the generation of reports. #------------------------------------------------------------------------- import time import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/PluginUtils/_StyleEditor.py b/gramps2/src/PluginUtils/_StyleEditor.py index cb2de16a6..8d24251a9 100644 --- a/gramps2/src/PluginUtils/_StyleEditor.py +++ b/gramps2/src/PluginUtils/_StyleEditor.py @@ -32,7 +32,7 @@ __version__ = "$Revision$" # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import logging log = logging.getLogger(".") diff --git a/gramps2/src/PluginUtils/_Tool.py b/gramps2/src/PluginUtils/_Tool.py index 09b0f9652..8f457d284 100644 --- a/gramps2/src/PluginUtils/_Tool.py +++ b/gramps2/src/PluginUtils/_Tool.py @@ -31,7 +31,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- from types import ClassType, InstanceType -from gettext import gettext as _ +from TransUtils import sgettext as _ import logging log = logging.getLogger(".") diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py index cb245ddfe..72430ab9b 100644 --- a/gramps2/src/QuestionDialog.py +++ b/gramps2/src/QuestionDialog.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/RelImage.py b/gramps2/src/RelImage.py index 1145b5456..e87474c32 100644 --- a/gramps2/src/RelImage.py +++ b/gramps2/src/RelImage.py @@ -39,7 +39,7 @@ from QuestionDialog import ErrorDialog, WarningDialog # #------------------------------------------------------------------------- import const -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/RelLib/_Date.py b/gramps2/src/RelLib/_Date.py index 552f03e7c..39ba60299 100644 --- a/gramps2/src/RelLib/_Date.py +++ b/gramps2/src/RelLib/_Date.py @@ -25,7 +25,7 @@ __author__ = "Donald N. Allingham" __version__ = "$Revision$" -from gettext import gettext as _ +from TransUtils import sgettext as _ from _CalSdn import * #------------------------------------------------------------------------- diff --git a/gramps2/src/Relationship.py b/gramps2/src/Relationship.py index cf9aa1379..dc6a97751 100644 --- a/gramps2/src/Relationship.py +++ b/gramps2/src/Relationship.py @@ -28,8 +28,7 @@ import RelLib import types -from gettext import gettext as _ -from TransUtils import strip_context as __ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # @@ -279,28 +278,28 @@ class RelationshipCalculator: elif gender == RelLib.Person.FEMALE: return _("wife") else: - return __("gender unknown|spouse") + return _("gender unknown|spouse") elif family_rel == RelLib.Family.UNMARRIED: if gender == RelLib.Person.MALE: - return __("unmarried|husband") + return _("unmarried|husband") elif gender == RelLib.Person.FEMALE: - return __("unmarried|wife") + return _("unmarried|wife") else: - return __("gender unknown,unmarried|spouse") + return _("gender unknown,unmarried|spouse") elif family_rel == RelLib.Family.CIVIL_UNION: if gender == RelLib.Person.MALE: - return __("male,civil union|partner") + return _("male,civil union|partner") elif gender == RelLib.Person.FEMALE: - return __("female,civil union|partner") + return _("female,civil union|partner") else: - return __("gender unknown,civil union|partner") + return _("gender unknown,civil union|partner") else: if gender == RelLib.Person.MALE: - return __("male,unknown relation|partner") + return _("male,unknown relation|partner") elif gender == RelLib.Person.FEMALE: - return __("female,unknown relation|partner") + return _("female,unknown relation|partner") else: - return __("gender unknown,unknown relation|partner") + return _("gender unknown,unknown relation|partner") else: return None return None diff --git a/gramps2/src/ScratchPad.py b/gramps2/src/ScratchPad.py index 4fb1b5660..b8c724f12 100644 --- a/gramps2/src/ScratchPad.py +++ b/gramps2/src/ScratchPad.py @@ -28,7 +28,7 @@ import cPickle as pickle import os from xml.sax.saxutils import escape -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/SelectEvent.py b/gramps2/src/SelectEvent.py index 425a39f9c..f66a10dc7 100644 --- a/gramps2/src/SelectEvent.py +++ b/gramps2/src/SelectEvent.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/SelectObject.py b/gramps2/src/SelectObject.py index f06a0da29..cadcab016 100644 --- a/gramps2/src/SelectObject.py +++ b/gramps2/src/SelectObject.py @@ -37,7 +37,7 @@ import gc # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/SelectPerson.py b/gramps2/src/SelectPerson.py index b36178b1c..5ea2a80ec 100644 --- a/gramps2/src/SelectPerson.py +++ b/gramps2/src/SelectPerson.py @@ -25,7 +25,7 @@ # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ import gc #------------------------------------------------------------------------- diff --git a/gramps2/src/Spell.py b/gramps2/src/Spell.py index 9185748d7..e30753a81 100644 --- a/gramps2/src/Spell.py +++ b/gramps2/src/Spell.py @@ -29,7 +29,7 @@ present, we default to no spell checking. import Config -from gettext import gettext as _ +from TransUtils import sgettext as _ #----------------------------------------------------------- # diff --git a/gramps2/src/StartupDialog.py b/gramps2/src/StartupDialog.py index 739ada963..46e107559 100644 --- a/gramps2/src/StartupDialog.py +++ b/gramps2/src/StartupDialog.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/TipOfDay.py b/gramps2/src/TipOfDay.py index bf9c58e91..b2253d8d5 100644 --- a/gramps2/src/TipOfDay.py +++ b/gramps2/src/TipOfDay.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------- from xml.parsers.expat import ParserCreate from random import Random -from gettext import gettext as _ +from TransUtils import sgettext as _ import os #------------------------------------------------------------------------- diff --git a/gramps2/src/TransUtils.py b/gramps2/src/TransUtils.py index 6fde7a6d0..33b219c2a 100644 --- a/gramps2/src/TransUtils.py +++ b/gramps2/src/TransUtils.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # 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 @@ -18,9 +18,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -from gettext import gettext as _ +# $Id$ -def strip_context(msgid,sep='|'): +from gettext import gettext + +def sgettext(msgid,sep='|'): """ Strip the context used for resolving translation ambiguities. @@ -37,8 +39,8 @@ def strip_context(msgid,sep='|'): @rtype: unicode """ - msgval = _(msgid) - sep_idx = msgid.rfind(sep) - if msgval == msgid and sep_idx != -1: + msgval = gettext(msgid) + if msgval == msgid: + sep_idx = msgid.rfind(sep) msgval = msgid[sep_idx+1:] return msgval diff --git a/gramps2/src/TreeViews/_PersonTreeView.py b/gramps2/src/TreeViews/_PersonTreeView.py index 9c0f20764..9a1bb1867 100644 --- a/gramps2/src/TreeViews/_PersonTreeView.py +++ b/gramps2/src/TreeViews/_PersonTreeView.py @@ -1,5 +1,5 @@ -from gettext import gettext as _ +from TransUtils import sgettext as _ import cgi import gtk diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 197cdac02..9367959f8 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -29,7 +29,7 @@ import os import sys import locale import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py index 8fd0a572b..bf40d8453 100644 --- a/gramps2/src/ViewManager.py +++ b/gramps2/src/ViewManager.py @@ -25,7 +25,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ from bsddb import db import os from cStringIO import StringIO diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 77bad3394..3b9b6bc4b 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -31,7 +31,7 @@ Provides a BaseDoc based interface to the AbiWord document format. #------------------------------------------------------------------------- import base64 import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/AsciiDoc.py b/gramps2/src/docgen/AsciiDoc.py index ef0ddfa38..66760d929 100644 --- a/gramps2/src/docgen/AsciiDoc.py +++ b/gramps2/src/docgen/AsciiDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/HtmlDoc.py b/gramps2/src/docgen/HtmlDoc.py index 0edb718ac..40a86a0f6 100644 --- a/gramps2/src/docgen/HtmlDoc.py +++ b/gramps2/src/docgen/HtmlDoc.py @@ -28,7 +28,7 @@ import os import re import time -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index 563f7181b..001af0d50 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -29,7 +29,7 @@ import time import cStringIO import gzip import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/LPRDoc.py b/gramps2/src/docgen/LPRDoc.py index 3b7070af7..79001f0a5 100644 --- a/gramps2/src/docgen/LPRDoc.py +++ b/gramps2/src/docgen/LPRDoc.py @@ -34,7 +34,7 @@ # #------------------------------------------------------------------------ from string import punctuation -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/LaTeXDoc.py b/gramps2/src/docgen/LaTeXDoc.py index be725d0f5..2f37332b6 100644 --- a/gramps2/src/docgen/LaTeXDoc.py +++ b/gramps2/src/docgen/LaTeXDoc.py @@ -33,7 +33,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/ODFDoc.py b/gramps2/src/docgen/ODFDoc.py index 425c2a6b3..b2d91b2cc 100644 --- a/gramps2/src/docgen/ODFDoc.py +++ b/gramps2/src/docgen/ODFDoc.py @@ -53,7 +53,7 @@ import Mime # internationalization # #------------------------------------------------------------------------- -from gettext import gettext as _ +from TransUtils import sgettext as _ from xml.sax.saxutils import escape _apptype = 'application/vnd.oasis.opendocument.text' diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py index 29946caa3..652ef7a83 100644 --- a/gramps2/src/docgen/OpenOfficeDoc.py +++ b/gramps2/src/docgen/OpenOfficeDoc.py @@ -31,7 +31,7 @@ import time import locale from cStringIO import StringIO from math import pi, cos, sin, fabs -from gettext import gettext as _ +from TransUtils import sgettext as _ from xml.sax.saxutils import escape #------------------------------------------------------------------------- diff --git a/gramps2/src/docgen/OpenSpreadSheet.py b/gramps2/src/docgen/OpenSpreadSheet.py index 011c0f44f..93a0003f8 100644 --- a/gramps2/src/docgen/OpenSpreadSheet.py +++ b/gramps2/src/docgen/OpenSpreadSheet.py @@ -28,7 +28,7 @@ import os import tempfile import zipfile -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/PSDrawDoc.py b/gramps2/src/docgen/PSDrawDoc.py index bcc03016b..eb17b99e2 100644 --- a/gramps2/src/docgen/PSDrawDoc.py +++ b/gramps2/src/docgen/PSDrawDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- from math import pi, cos, sin -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/PdfDoc.py b/gramps2/src/docgen/PdfDoc.py index 0c63449f0..1bb43d0cc 100644 --- a/gramps2/src/docgen/PdfDoc.py +++ b/gramps2/src/docgen/PdfDoc.py @@ -25,7 +25,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/RTFDoc.py b/gramps2/src/docgen/RTFDoc.py index abd4cbd2d..cff1e48c2 100644 --- a/gramps2/src/docgen/RTFDoc.py +++ b/gramps2/src/docgen/RTFDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/SvgDrawDoc.py b/gramps2/src/docgen/SvgDrawDoc.py index 007ff5a34..7156dd679 100644 --- a/gramps2/src/docgen/SvgDrawDoc.py +++ b/gramps2/src/docgen/SvgDrawDoc.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------- from math import pi, cos, sin, fabs -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/AncestorChart.py b/gramps2/src/plugins/AncestorChart.py index c8698fb58..957afc18b 100644 --- a/gramps2/src/plugins/AncestorChart.py +++ b/gramps2/src/plugins/AncestorChart.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/AncestorChart2.py b/gramps2/src/plugins/AncestorChart2.py index 60e88467c..987785cc3 100644 --- a/gramps2/src/plugins/AncestorChart2.py +++ b/gramps2/src/plugins/AncestorChart2.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index 41fa8832a..edffccede 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index de52c8bed..677cab97d 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -26,7 +26,7 @@ # Python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import os #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py index 8adbf3931..eb8cabe2c 100644 --- a/gramps2/src/plugins/BookReport.py +++ b/gramps2/src/plugins/BookReport.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Calendar.py b/gramps2/src/plugins/Calendar.py index bae3fe7d4..d4fdee216 100644 --- a/gramps2/src/plugins/Calendar.py +++ b/gramps2/src/plugins/Calendar.py @@ -25,7 +25,7 @@ __version__ = "$Revision$" # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import datetime, time from xml.parsers import expat import const diff --git a/gramps2/src/plugins/ChangeNames.py b/gramps2/src/plugins/ChangeNames.py index 21f91eaeb..12449d597 100644 --- a/gramps2/src/plugins/ChangeNames.py +++ b/gramps2/src/plugins/ChangeNames.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import re -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/ChangeTypes.py b/gramps2/src/plugins/ChangeTypes.py index c412a71ed..ba9836c91 100644 --- a/gramps2/src/plugins/ChangeTypes.py +++ b/gramps2/src/plugins/ChangeTypes.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index 4329d2088..7e89a5c45 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -30,7 +30,7 @@ import os import cStringIO import sets -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Checkpoint.py b/gramps2/src/plugins/Checkpoint.py index db8c9c576..93f569d79 100644 --- a/gramps2/src/plugins/Checkpoint.py +++ b/gramps2/src/plugins/Checkpoint.py @@ -31,7 +31,7 @@ import os import popen2 import locale import time -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/CmdRef.py b/gramps2/src/plugins/CmdRef.py index 1bba732d1..2c34b9485 100644 --- a/gramps2/src/plugins/CmdRef.py +++ b/gramps2/src/plugins/CmdRef.py @@ -30,7 +30,7 @@ import os import tempfile from cgi import escape -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/CountAncestors.py b/gramps2/src/plugins/CountAncestors.py index b1bfc3938..a65ac5129 100644 --- a/gramps2/src/plugins/CountAncestors.py +++ b/gramps2/src/plugins/CountAncestors.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ from sets import Set #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/CustomBookText.py b/gramps2/src/plugins/CustomBookText.py index fd2ce03ca..cdec3337e 100644 --- a/gramps2/src/plugins/CustomBookText.py +++ b/gramps2/src/plugins/CustomBookText.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index 468f20489..a0cdf3407 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -27,7 +27,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Desbrowser.py b/gramps2/src/plugins/Desbrowser.py index 0352b5eff..100fc47a2 100644 --- a/gramps2/src/plugins/Desbrowser.py +++ b/gramps2/src/plugins/Desbrowser.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DescendChart.py b/gramps2/src/plugins/DescendChart.py index 2aa7797d5..c78ca605c 100644 --- a/gramps2/src/plugins/DescendChart.py +++ b/gramps2/src/plugins/DescendChart.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import math -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index 245c778f3..8caafc565 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 9946d5850..1f2bc6c40 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -28,7 +28,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import cStringIO #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 11e6dfe21..c70ea6151 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -28,7 +28,7 @@ # standard python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ import cStringIO #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/Eval.py b/gramps2/src/plugins/Eval.py index f74b1becd..dffa6dac9 100644 --- a/gramps2/src/plugins/Eval.py +++ b/gramps2/src/plugins/Eval.py @@ -31,7 +31,7 @@ Provides a python evaluation window import os import cStringIO import sys -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py index ca5cb621e..d813b8cdc 100644 --- a/gramps2/src/plugins/EventCmp.py +++ b/gramps2/src/plugins/EventCmp.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/ExportVCalendar.py b/gramps2/src/plugins/ExportVCalendar.py index 88364d129..79b809b4b 100644 --- a/gramps2/src/plugins/ExportVCalendar.py +++ b/gramps2/src/plugins/ExportVCalendar.py @@ -56,7 +56,7 @@ import const import Utils from RelLib import Date import Errors -from gettext import gettext as _ +from TransUtils import sgettext as _ from QuestionDialog import ErrorDialog from PluginUtils import register_export diff --git a/gramps2/src/plugins/ExportVCard.py b/gramps2/src/plugins/ExportVCard.py index 7b00d8ddf..120a39358 100644 --- a/gramps2/src/plugins/ExportVCard.py +++ b/gramps2/src/plugins/ExportVCard.py @@ -54,7 +54,7 @@ import GenericFilter import const from RelLib import Date import Errors -from gettext import gettext as _ +from TransUtils import sgettext as _ from QuestionDialog import ErrorDialog from PluginUtils import register_export diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index d35cb5373..5bc1d7ce3 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -27,7 +27,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FanChart.py b/gramps2/src/plugins/FanChart.py index b9a1cbc6f..a96d88e4e 100644 --- a/gramps2/src/plugins/FanChart.py +++ b/gramps2/src/plugins/FanChart.py @@ -25,7 +25,7 @@ # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 76a1290c9..0476cffad 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -30,7 +30,7 @@ __author__ = "Don Allingham" # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 7a3a15f03..d0322cd4d 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -27,7 +27,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index 8aff65523..d097a8ffd 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index 0c24ded8e..89b2e0df4 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -29,7 +29,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ from time import asctime #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/ImportGeneWeb.py b/gramps2/src/plugins/ImportGeneWeb.py index 27665d37c..d1af108a5 100644 --- a/gramps2/src/plugins/ImportGeneWeb.py +++ b/gramps2/src/plugins/ImportGeneWeb.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import re import time -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/ImportvCard.py b/gramps2/src/plugins/ImportvCard.py index b3477cfed..1284ebb55 100644 --- a/gramps2/src/plugins/ImportvCard.py +++ b/gramps2/src/plugins/ImportvCard.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import re import time -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 32adce33a..1bae7a9ff 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index f07243d88..f247336c9 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Leak.py b/gramps2/src/plugins/Leak.py index 29f946561..f63a2f48a 100644 --- a/gramps2/src/plugins/Leak.py +++ b/gramps2/src/plugins/Leak.py @@ -30,7 +30,7 @@ Show uncollected objects in a window. # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ from bsddb.db import DBError #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index 2a3f28063..338c44531 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index 1d4747533..6a3804092 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -36,7 +36,7 @@ import locale import shutil import codecs import tarfile -from gettext import gettext as _ +from TransUtils import sgettext as _ from cStringIO import StringIO try: diff --git a/gramps2/src/plugins/PHPGedViewConnector.py b/gramps2/src/plugins/PHPGedViewConnector.py index 6675deb81..cdce74eb5 100644 --- a/gramps2/src/plugins/PHPGedViewConnector.py +++ b/gramps2/src/plugins/PHPGedViewConnector.py @@ -31,7 +31,7 @@ import os from random import randint from tempfile import NamedTemporaryFile from tempfile import mkstemp -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_tool # # Interface to phpGedView diff --git a/gramps2/src/plugins/PatchNames.py b/gramps2/src/plugins/PatchNames.py index 5d895130c..dbac57f20 100644 --- a/gramps2/src/plugins/PatchNames.py +++ b/gramps2/src/plugins/PatchNames.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import re -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/ReadPkg.py b/gramps2/src/plugins/ReadPkg.py index b5ca57e2e..6957640ee 100644 --- a/gramps2/src/plugins/ReadPkg.py +++ b/gramps2/src/plugins/ReadPkg.py @@ -30,7 +30,7 @@ #------------------------------------------------------------------------- import os import tarfile -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Rebuild.py b/gramps2/src/plugins/Rebuild.py index e75918a9c..5531c63dc 100644 --- a/gramps2/src/plugins/Rebuild.py +++ b/gramps2/src/plugins/Rebuild.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os import cStringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/RelCalc.py b/gramps2/src/plugins/RelCalc.py index 9978bbf93..1b10b468e 100644 --- a/gramps2/src/plugins/RelCalc.py +++ b/gramps2/src/plugins/RelCalc.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/ReorderIds.py b/gramps2/src/plugins/ReorderIds.py index 339d79ac5..339b1b14c 100644 --- a/gramps2/src/plugins/ReorderIds.py +++ b/gramps2/src/plugins/ReorderIds.py @@ -31,7 +31,7 @@ scheme specified in the database's prefix ids # #------------------------------------------------------------------------ import re -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index 3fd675e03..7dd80e699 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -26,8 +26,7 @@ #------------------------------------------------------------------------ import os import time -from gettext import gettext as _ -from TransUtils import strip_context as __ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # @@ -165,7 +164,7 @@ class SimpleBookTitleOptions(ReportOptions.ReportOptions): self.footer_entry = gtk.Entry() self.footer_entry.set_text(footer_string) - dialog.add_frame_option(_('Text'),__('book|Title'),self.title_entry) + dialog.add_frame_option(_('Text'),_('book|Title'),self.title_entry) dialog.add_frame_option(_('Text'),_('Subtitle'),self.subtitle_entry) dialog.add_frame_option(_('Text'),_('Footer'),self.footer_entry) diff --git a/gramps2/src/plugins/SoundGen.py b/gramps2/src/plugins/SoundGen.py index 933a7fdd2..fe5a5899a 100644 --- a/gramps2/src/plugins/SoundGen.py +++ b/gramps2/src/plugins/SoundGen.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------ import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/StatisticsChart.py b/gramps2/src/plugins/StatisticsChart.py index a003efc43..f2d79f8d6 100644 --- a/gramps2/src/plugins/StatisticsChart.py +++ b/gramps2/src/plugins/StatisticsChart.py @@ -34,7 +34,7 @@ Statistics Chart report # #------------------------------------------------------------------------ import time -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # @@ -57,7 +57,6 @@ from PluginUtils import Report, ReportOptions, ReportUtils, register_report import GenericFilter import DateHandler from Utils import ProgressMeter -from TransUtils import strip_context as __ #------------------------------------------------------------------------ # @@ -92,7 +91,7 @@ class Extract: """Methods for extracting statistical data from the database""" # key, non-localized name, localized name, type method, data method self.extractors = { - 'data_title': ("Title", __("person|Title"), + 'data_title': ("Title", _("person|Title"), self.get_person, self.get_title), 'data_sname': ("Surname", _("Surname"), self.get_person, self.get_surname), diff --git a/gramps2/src/plugins/Summary.py b/gramps2/src/plugins/Summary.py index 902041d8b..62efb8fa3 100644 --- a/gramps2/src/plugins/Summary.py +++ b/gramps2/src/plugins/Summary.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------ import os import posixpath -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/TestcaseGenerator.py b/gramps2/src/plugins/TestcaseGenerator.py index aaad8fbef..8ca9469f7 100644 --- a/gramps2/src/plugins/TestcaseGenerator.py +++ b/gramps2/src/plugins/TestcaseGenerator.py @@ -31,7 +31,7 @@ import traceback import sys from random import randint,choice -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index 1347e4e39..418455b6a 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -29,8 +29,7 @@ Timeline report # python modules # #------------------------------------------------------------------------ -from gettext import gettext as _ -from TransUtils import strip_context as __ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # @@ -452,7 +451,7 @@ class TimeLineOptions(ReportOptions.ReportOptions): else: self.title_box.set_text(dialog.get_header(dialog.person.get_primary_name().get_name())) self.title_box.show() - dialog.add_option(__('report|Title'),self.title_box) + dialog.add_option(_('report|Title'),self.title_box) def parse_user_options(self,dialog): """ diff --git a/gramps2/src/plugins/Verify.py b/gramps2/src/plugins/Verify.py index 134cbb38f..9f8eae960 100644 --- a/gramps2/src/plugins/Verify.py +++ b/gramps2/src/plugins/Verify.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------ import os import cStringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/WriteCD.py b/gramps2/src/plugins/WriteCD.py index 5f5f1c6ac..200c7b2de 100644 --- a/gramps2/src/plugins/WriteCD.py +++ b/gramps2/src/plugins/WriteCD.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os from cStringIO import StringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py index 996ed9214..013c2ae55 100644 --- a/gramps2/src/plugins/WriteFtree.py +++ b/gramps2/src/plugins/WriteFtree.py @@ -29,7 +29,7 @@ #------------------------------------------------------------------------- import os from cStringIO import StringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/WriteGeneWeb.py b/gramps2/src/plugins/WriteGeneWeb.py index 3bd560ccc..3646adebc 100644 --- a/gramps2/src/plugins/WriteGeneWeb.py +++ b/gramps2/src/plugins/WriteGeneWeb.py @@ -28,7 +28,7 @@ # #------------------------------------------------------------------------- import os -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/WritePkg.py b/gramps2/src/plugins/WritePkg.py index 07132f21c..809af8493 100644 --- a/gramps2/src/plugins/WritePkg.py +++ b/gramps2/src/plugins/WritePkg.py @@ -31,7 +31,7 @@ import time import os import tarfile from cStringIO import StringIO -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/rel_da.py b/gramps2/src/plugins/rel_da.py index d25db922b..1c1557b4c 100644 --- a/gramps2/src/plugins/rel_da.py +++ b/gramps2/src/plugins/rel_da.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_de.py b/gramps2/src/plugins/rel_de.py index cb627bb10..5e08107f0 100644 --- a/gramps2/src/plugins/rel_de.py +++ b/gramps2/src/plugins/rel_de.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_es.py b/gramps2/src/plugins/rel_es.py index b3f04e7d3..c73ec39df 100644 --- a/gramps2/src/plugins/rel_es.py +++ b/gramps2/src/plugins/rel_es.py @@ -32,7 +32,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_fi.py b/gramps2/src/plugins/rel_fi.py index fffabea82..2f80f2e58 100644 --- a/gramps2/src/plugins/rel_fi.py +++ b/gramps2/src/plugins/rel_fi.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_fr.py b/gramps2/src/plugins/rel_fr.py index bc0b69a58..0c7c6b1f1 100644 --- a/gramps2/src/plugins/rel_fr.py +++ b/gramps2/src/plugins/rel_fr.py @@ -30,7 +30,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_hu.py b/gramps2/src/plugins/rel_hu.py index ed7cfda3d..3883dfd07 100644 --- a/gramps2/src/plugins/rel_hu.py +++ b/gramps2/src/plugins/rel_hu.py @@ -34,7 +34,7 @@ import RelLib import Relationship from PluginUtils import register_relcalc import types -from gettext import gettext as _ +from TransUtils import sgettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/plugins/rel_no.py b/gramps2/src/plugins/rel_no.py index fe6fee999..616db4691 100644 --- a/gramps2/src/plugins/rel_no.py +++ b/gramps2/src/plugins/rel_no.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #------------------------------------------------------------------------- diff --git a/gramps2/src/plugins/rel_sv.py b/gramps2/src/plugins/rel_sv.py index 019dcdd29..60dcc2df4 100644 --- a/gramps2/src/plugins/rel_sv.py +++ b/gramps2/src/plugins/rel_sv.py @@ -33,7 +33,7 @@ import RelLib import Relationship import types -from gettext import gettext as _ +from TransUtils import sgettext as _ from PluginUtils import register_relcalc #-------------------------------------------------------------------------