* various: Use TransUtils.sgettext instead of gettext.gettext to work out stripping the context.

svn: r6155

gramps2/ChangeLog

@@ -1,4 +1,6 @@
 2006-03-16  Alex Roitman  <shura@gramps-project.org>
+	* 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.

gramps2/src/AddMedia.py

@@ -37,7 +37,7 @@ import os
 #
 #-------------------------------------------------------------------------
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Assistant.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import os
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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 _
 
 #-------------------------------------------------------------------------
 #

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'),

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'),

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

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

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'),

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
 
 #-------------------------------------------------------------------------

gramps2/src/DataViews/_PersonView.py

@@ -27,7 +27,7 @@
 #
 #------------------------------------------------------------------------
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import cPickle as pickle
 
 #-------------------------------------------------------------------------

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'),

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'),

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'),

gramps2/src/DateEdit.py

@@ -41,7 +41,7 @@ __version__ = "$Revision$"
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import gc
 
 #-------------------------------------------------------------------------

gramps2/src/DateHandler/_DateDisplay.py

@@ -33,7 +33,7 @@ __version__ = "$Revision$"
 # python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/DisplayModels.py

@@ -25,7 +25,7 @@
 #
 #-------------------------------------------------------------------------
 import time
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import locale
 
 import logging

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:

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Editors/_EditAttribute.py

@@ -33,7 +33,7 @@ __version__ = "$Revision$"
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Editors/_EditEvent.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 try:
     set()

gramps2/src/Editors/_EditEventRef.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 try:
     set()

gramps2/src/Editors/_EditFamily.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 import cPickle as pickle
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Editors/_EditMedia.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import os
 
 #-------------------------------------------------------------------------

gramps2/src/Editors/_EditMediaRef.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Editors/_EditName.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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(".")

gramps2/src/Editors/_EditPrimary.py

@@ -20,7 +20,7 @@
 
 # $Id$
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 import DisplayState
 import DateHandler

gramps2/src/Editors/_EditReference.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 try:
     set()

gramps2/src/Editors/_EditRepository.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/Editors/_EditSecondary.py

@@ -20,7 +20,7 @@
 
 # $Id$
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 import DisplayState
 import Config

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(".")

gramps2/src/Editors/_EditSourceRef.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 try:
     set()

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
 
 #-------------------------------------------------------------------------

gramps2/src/Exporter.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 <name>')
     description = _("Matches people with a specified (partial) name")
     category    = _('General filters')

gramps2/src/GrampsCfg.py

@@ -27,7 +27,7 @@
 #-------------------------------------------------------------------------
 import os
 import sets
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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"""

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")
 

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:

gramps2/src/GrampsDb/_ReadGrdb.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import sets
 
 #-------------------------------------------------------------------------

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
 
 #------------------------------------------------------------------------

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 _
 
 #------------------------------------------------------------------------
 #

gramps2/src/GrampsDb/_WriteGrdb.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #------------------------------------------------------------------------
 #

gramps2/src/GrampsLogger/_ErrorReportAssistant.py

@@ -1,4 +1,4 @@
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 import sys,os
 import const

gramps2/src/GrampsLogger/_ErrorView.py

@@ -1,4 +1,4 @@
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 import gtk
 

gramps2/src/GrampsWidgets.py

@@ -23,7 +23,7 @@
 import cgi
 import locale
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/MergeData.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/MergePeople.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import sets
 
 #-------------------------------------------------------------------------

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

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',

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

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")

gramps2/src/ObjectSelector/_PersonTreeFrame.py

@@ -20,7 +20,7 @@
 
 # $Id$
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 import gtk
 import gobject

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

gramps2/src/PageView.py

@@ -25,7 +25,7 @@
 # python
 #
 #----------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #----------------------------------------------------------------
 #

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

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/PluginUtils/_PaperMenu.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

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
 

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 _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #------------------------------------------------------------------------
 #

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(".")
 

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(".")
 

gramps2/src/QuestionDialog.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

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 *
 
 #-------------------------------------------------------------------------

gramps2/src/Relationship.py

@@ -28,8 +28,7 @@
 
 import RelLib
 import types
-from gettext import gettext as _
+from TransUtils import sgettext as _
-from TransUtils import strip_context 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

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/SelectEvent.py

@@ -25,7 +25,7 @@
 # internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/SelectObject.py

@@ -37,7 +37,7 @@ import gc
 # internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/SelectPerson.py

@@ -25,7 +25,7 @@
 # internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import gc
 
 #-------------------------------------------------------------------------

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 _
 
 #-----------------------------------------------------------
 #

gramps2/src/StartupDialog.py

@@ -25,7 +25,7 @@
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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)
+    msgval = gettext(msgid)
-    sep_idx = msgid.rfind(sep)
+    if msgval == msgid:
-    if msgval == msgid and sep_idx != -1:
+        sep_idx = msgid.rfind(sep)
         msgval = msgid[sep_idx+1:]
     return msgval

gramps2/src/TreeViews/_PersonTreeView.py

@@ -1,5 +1,5 @@
 
-from gettext import gettext as _
+from TransUtils import sgettext as _
 import cgi
 
 import gtk

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 _
 
 #-------------------------------------------------------------------------
 #

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

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/docgen/AsciiDoc.py

@@ -26,7 +26,7 @@
 #
 #------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #

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 _
 
 #------------------------------------------------------------------------
 #

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 _
 
 #------------------------------------------------------------------------
 #

gramps2/src/docgen/LPRDoc.py

@@ -34,7 +34,7 @@
 #
 #------------------------------------------------------------------------
 from string import punctuation
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #

gramps2/src/docgen/LaTeXDoc.py

@@ -33,7 +33,7 @@
 # python modules 
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #

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'

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
 
 #-------------------------------------------------------------------------

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 _
 
 #-------------------------------------------------------------------------
 #

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 _
         
 #-------------------------------------------------------------------------
 #

gramps2/src/docgen/PdfDoc.py

@@ -25,7 +25,7 @@
 # Python modules
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #

gramps2/src/docgen/RTFDoc.py

@@ -26,7 +26,7 @@
 #
 #------------------------------------------------------------------------
 import os
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #

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 _
 
 #-------------------------------------------------------------------------
 #

gramps2/src/plugins/AncestorChart.py

@@ -27,7 +27,7 @@
 # python modules
 #
 #------------------------------------------------------------------------
-from gettext import gettext as _
+from TransUtils import sgettext as _
 
 #------------------------------------------------------------------------
 #