From b4ca613e21e8fca40a9af96fce72d6c022dd923f Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Sat, 10 Nov 2012 11:26:14 +0000
Subject: [PATCH] Fix some gettext warnings

svn: r20646
---
 gramps/cli/user.py                    | 1 +
 gramps/gen/filters/rules/_ispublic.py | 1 +
 gramps/plugins/import/importgrdb.py   | 1 +
 gramps/plugins/lib/libnarrate.py      | 2 ++
 po/test/po_test.py                    | 6 +++---
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gramps/cli/user.py b/gramps/cli/user.py
index db6d94958..ea9d9933d 100644
--- a/gramps/cli/user.py
+++ b/gramps/cli/user.py
@@ -38,6 +38,7 @@ import sys
 # Gramps Modules
 #
 #------------------------------------------------------------------------
+from gramps.gen.ggettext import gettext as _
 from gramps.gen.user import User
 
 #------------------------------------------------------------------------
diff --git a/gramps/gen/filters/rules/_ispublic.py b/gramps/gen/filters/rules/_ispublic.py
index 3b6e5f831..611462fc9 100644
--- a/gramps/gen/filters/rules/_ispublic.py
+++ b/gramps/gen/filters/rules/_ispublic.py
@@ -26,6 +26,7 @@
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
+from gramps.gen.ggettext import gettext as _
 from . import Rule
 
 #-------------------------------------------------------------------------
diff --git a/gramps/plugins/import/importgrdb.py b/gramps/plugins/import/importgrdb.py
index d98ec27de..27a1551b4 100644
--- a/gramps/plugins/import/importgrdb.py
+++ b/gramps/plugins/import/importgrdb.py
@@ -35,6 +35,7 @@ LOG = logging.getLogger(".Db")
 # Gramps Modules
 #
 #-------------------------------------------------------------------------
+from gramps.gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps/plugins/lib/libnarrate.py b/gramps/plugins/lib/libnarrate.py
index f41117f0a..3a8257345 100644
--- a/gramps/plugins/lib/libnarrate.py
+++ b/gramps/plugins/lib/libnarrate.py
@@ -71,6 +71,8 @@ def _get_empty_endnote_numbers(obj):
     """
     return ""
 
+# avoid normal translation!
+##from gramps.gen.ggettext import gettext as _
 def _(message): return message
 
 #------------------------------------------------------------------------
diff --git a/po/test/po_test.py b/po/test/po_test.py
index c362f3522..4975fa780 100644
--- a/po/test/po_test.py
+++ b/po/test/po_test.py
@@ -23,7 +23,7 @@
 
 """ Unittest for testing POTFILES.in and Makefile contents """
 
-# PYTHONPATH=/../src python po_test.py
+# PYTHONPATH=/../gramps python po_test.py
 
 import unittest
 import os
@@ -168,8 +168,8 @@ def suite2():
             continue
         if glob.fnmatch.fnmatch(potfile,"*.py"):
             suite.addTest(TestGetText('test_gettext_py_%04d', potfile,
-                                      ["import gettext",
-                                       "from gen.ggettext",
+                                      ["import gettext", 
+                                       "from gramps.gen.ggettext",
                                        "import sgettext"]))
         elif glob.fnmatch.fnmatch(potfile,"*.glade"):
             suite.addTest(TestGetText('test_gettext_glade_%04d', potfile,