[r21968]GrampsLocale: Remove get_translation()

Only one base translation per locale. To set up a different locale
on any axis (locale, domain, directory, or languages) instantiate a
secondary locale by calling GrampsLocale() with the appropriate
arguments.

svn: r21985

gramps/cli/arghandler.py

@@ -56,7 +56,7 @@ from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE, BookList
 from .plug import cl_report, cl_book
 from .user import User
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/cli/argparser.py

@@ -51,7 +51,7 @@ from gramps.gen.config import config
 from gramps.gen.utils.configmanager import safe_eval
 from gramps.gen.utils.file import get_unicode_path_from_env_var
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 # Note: Make sure to edit const.py.in POPT_TABLE too!
 _HELP = _("""

gramps/cli/clidbman.py

@@ -60,7 +60,7 @@ _LOG = logging.getLogger(DBLOGNAME)
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from gramps.gen.db import DbBsddb
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.config import config

gramps/cli/grampscli.py

@@ -36,7 +36,7 @@ Provides also two small base classes: CLIDbLoader, CLIManager
 from __future__ import print_function
 
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 import os
 import sys
 

gramps/cli/plug/__init__.py

@@ -65,7 +65,7 @@ from gramps.gen.constfunc import STRTYPE, conv_to_unicode_direct
 from ..grampscli import CLIManager
 from ..user import User
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #------------------------------------------------------------------------
 #

gramps/cli/user.py

@@ -39,7 +39,7 @@ import sys
 #
 #------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from gramps.gen.user import User
 
 #------------------------------------------------------------------------

gramps/gen/config.py

@@ -42,7 +42,7 @@ import logging
 #
 #---------------------------------------------------------------
 from .const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from .const import HOME_DIR, USER_HOME, VERSION_DIR
 from .utils.configmanager import ConfigManager
 

gramps/gen/const.py

@@ -195,7 +195,7 @@ LICENSE_FILE = os.path.join(_resources.doc_dir, 'COPYING')
 #-------------------------------------------------------------------------
 from gramps.gen.utils.grampslocale import GrampsLocale
 GRAMPS_LOCALE = GrampsLocale(localedir=_resources.locale_dir)
-_ = GRAMPS_LOCALE.get_translation().sgettext
+_ = GRAMPS_LOCALE.translation.sgettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/datehandler/__init__.py

@@ -32,7 +32,7 @@ Class handling language-specific selection for date parser and displayer.
 import logging
 
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().sgettext
+_ = glocale.translation.sgettext
 # import prerequisites for localized handlers
 from ._datehandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY, 
                           register_datehandler)

gramps/gen/db/base.py

@@ -33,7 +33,7 @@ from this class.
 #
 #-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/db/exceptions.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 
 class DbException(Exception):

gramps/gen/db/read.py

@@ -49,7 +49,7 @@ if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
 else:
     from bsddb import db
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 import re
 
 import logging

gramps/gen/db/undoredo.py

@@ -47,7 +47,7 @@ if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
 else:
     from bsddb import db
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/db/upgrade.py

@@ -31,7 +31,7 @@ import logging
 LOG = logging.getLogger(".citation")
 
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from ..constfunc import cuni
 
 """

gramps/gen/db/write.py

@@ -81,7 +81,7 @@ from ..updatecallback import UpdateCallback
 from ..errors import DbError
 from ..constfunc import win, conv_to_unicode, cuni, UNITYPE, handle2internal
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 _LOG = logging.getLogger(DBLOGNAME)
 LOG = logging.getLogger(".citation")

gramps/gen/display/name.py

@@ -54,7 +54,7 @@ Specific symbols for parts of a name are defined:
 #
 #-------------------------------------------------------------------------
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().sgettext
+_ = glocale.translation.sgettext
 import re
 import logging
 LOG = logging.getLogger(".gramps.gen")

gramps/gen/filters/_filterparser.py

@@ -29,7 +29,7 @@ from __future__ import print_function, unicode_literals
 
 from xml.sax import handler
 from ..const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_changedsincebase.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 import re
 import time
 

gramps/gen/filters/rules/_everything.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasattributebase.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hascitationbase.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_haseventbase.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasgallerybase.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasgrampsid.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasldsbase.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasnotebase.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasnoteregexbase.py

@@ -27,7 +27,7 @@
 #-------------------------------------------------------------------------
 import re
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasnotesubstrbase.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hasreferencecountbase.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hassourcebase.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hassourcecountbase.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hassourceofbase.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hastagbase.py

@@ -28,7 +28,7 @@ Rule that checks for an object with a particular tag.
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_hastextmatchingsubstringof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_isprivate.py

@@ -24,7 +24,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_ispublic.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from . import Rule
 
 #-------------------------------------------------------------------------

gramps/gen/filters/rules/_matcheseventfilterbase.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_matchesfilterbase.py

@@ -36,7 +36,7 @@ LOG = logging.getLogger(".filter")
 # we need global variableCustomFilters, so we need to query gramps.gen.filters
 # when we need this variable, not import it at the start!
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 import gramps.gen.filters
 from . import Rule
 

gramps/gen/filters/rules/_matchessourceconfidencebase.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_matchessourcefilterbase.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_regexpidbase.py

@@ -27,7 +27,7 @@
 #-------------------------------------------------------------------------
 import re
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/_rule.py

@@ -31,7 +31,7 @@ Base class for filter rules.
 #
 #-------------------------------------------------------------------------
 from ...const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 import re
 
 #-------------------------------------------------------------------------

gramps/gen/filters/rules/citation/_allcitations.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_changedsince.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_citationprivate.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hascitation.py

@@ -29,7 +29,7 @@ Filter rule to match citation data.
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasgallery.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasidof.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasnote.py

@@ -30,7 +30,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasnoteregexp.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hasreferencecountof.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_hassource.py

@@ -30,7 +30,7 @@ Filter rule to match citation with a particular source.
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_matchesfilter.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_matchespagesubstringof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py

@@ -29,7 +29,7 @@
 import logging
 LOG = logging.getLogger(".citation")
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_matchessourcefilter.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/citation/_regexpidof.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_allevents.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_changedsince.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_eventprivate.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasattribute.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hascitation.py

@@ -30,7 +30,7 @@ Filter rule to match event with a particular citation.
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasdata.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasgallery.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasidof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasnote.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasnoteregexp.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hasreferencecountof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hassourcecount.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_hastype.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_matchesfilter.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_matchespersonfilter.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_matchessourceconfidence.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().sgettext
+_ = glocale.translation.sgettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_matchessourcefilter.py

@@ -28,7 +28,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/event/_regexpidof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_allfamilies.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_changedsince.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_childhasidof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_childhasnameof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_familyprivate.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_fatherhasidof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_fatherhasnameof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasattribute.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hascitation.py

@@ -30,7 +30,7 @@ Filter rule to match family with a particular citation.
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasevent.py

@@ -29,7 +29,7 @@ Filter rule to match families with a particular event.
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasgallery.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasidof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_haslds.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasnote.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasnoteregexp.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasreferencecountof.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hasreltype.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hassourcecount.py

@@ -29,7 +29,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hassourceof.py

@@ -27,7 +27,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 
 #-------------------------------------------------------------------------
 #

gramps/gen/filters/rules/family/_hastag.py

@@ -1,51 +0,0 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2010    Nick Hall
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# $Id$
-"""
-Rule that checks for a family with a particular tag.
-"""
-
-#-------------------------------------------------------------------------
-#
-# Standard Python modules
-#
-#-------------------------------------------------------------------------
-from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
-
-#-------------------------------------------------------------------------
-#
-# GRAMPS modules
-#
-#-------------------------------------------------------------------------
-from .._hastagbase import HasTagBase
-
-#-------------------------------------------------------------------------
-#
-# HasTag
-#
-#-------------------------------------------------------------------------
-class HasTag(HasTagBase):
-    """
-    Rule that checks for a family with a particular tag.
-    """
-    labels      = [ _('Tag:') ]
-    name        = _('Families with the <tag>')
-    description = _("Matches families with the particular tag")

gramps/gen/filters/rules/family/_hastwins.py

@@ -33,7 +33,7 @@
 #-------------------------------------------------------------------------
 from .. import Rule
 from gramps.gen.const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
 from ....lib.childreftype import ChildRefType
 
 #-------------------------------------------------------------------------

gramps/gen/filters/rules/family/_isbookmarked.py

@@ -26,7 +26,7 @@
 #
 #-------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
-_ = glocale.get_translation().gettext
+_ = glocale.translation.gettext
     
 #-------------------------------------------------------------------------
 #