From 64671663dd3fb27075e418923291e2436197ec8f Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 18 Jan 2013 22:23:11 +0000 Subject: [PATCH] GrampsLocale: Convert some late-added translations to GRAMPS_LOCALE svn: r21170 --- gramps/gen/filters/rules/family/_hastwins.py | 3 ++- gramps/gen/filters/rules/note/_hastype.py | 3 ++- gramps/plugins/gramplet/todo.py | 3 ++- gramps/plugins/gramplet/todogramplet.py | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gramps/gen/filters/rules/family/_hastwins.py b/gramps/gen/filters/rules/family/_hastwins.py index 1f19f732d..3aa384e60 100644 --- a/gramps/gen/filters/rules/family/_hastwins.py +++ b/gramps/gen/filters/rules/family/_hastwins.py @@ -25,7 +25,6 @@ # Standard Python modules # #------------------------------------------------------------------------- -from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -33,6 +32,8 @@ from ....ggettext import gettext as _ # #------------------------------------------------------------------------- from .. import Rule +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.get_translation().gettext from ....lib.childreftype import ChildRefType #------------------------------------------------------------------------- diff --git a/gramps/gen/filters/rules/note/_hastype.py b/gramps/gen/filters/rules/note/_hastype.py index 094252307..d8a5a21ad 100644 --- a/gramps/gen/filters/rules/note/_hastype.py +++ b/gramps/gen/filters/rules/note/_hastype.py @@ -25,7 +25,6 @@ # Standard Python modules # #------------------------------------------------------------------------- -from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -34,6 +33,8 @@ from ....ggettext import gettext as _ #------------------------------------------------------------------------- from ....lib.notetype import NoteType from .. import Rule +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.get_translation().gettext #------------------------------------------------------------------------- # diff --git a/gramps/plugins/gramplet/todo.py b/gramps/plugins/gramplet/todo.py index 4e5ebc6c5..c895e94c8 100644 --- a/gramps/plugins/gramplet/todo.py +++ b/gramps/plugins/gramplet/todo.py @@ -24,7 +24,8 @@ from gramps.gui.widgets.styledtexteditor import StyledTextEditor from gramps.gui.widgets import SimpleButton from gramps.gen.lib import StyledText, Note, NoteType from gramps.gen.db import DbTxn -from gramps.gen.ggettext import gettext as _ +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.get_translation().gettext from gi.repository import Gtk class ToDo(Gramplet): diff --git a/gramps/plugins/gramplet/todogramplet.py b/gramps/plugins/gramplet/todogramplet.py index 160fd23a4..6aaddd5ab 100644 --- a/gramps/plugins/gramplet/todogramplet.py +++ b/gramps/plugins/gramplet/todogramplet.py @@ -27,10 +27,9 @@ from gramps.gen.lib import StyledText, Note, NoteType from gramps.gen.filters import GenericFilterFactory, rules from gramps.gen.utils.db import navigation_label from gramps.gen.db import DbTxn -from gramps.gen.ggettext import gettext as _ from gi.repository import Gtk from gramps.gen.const import GRAMPS_LOCALE as glocale -_ = glocale.get_translation().sgettext +_ = glocale.get_translation().gettext class ToDoGramplet(Gramplet): """