Move gettext, ngettext and sgettext calls into the new ggettext module. All of them return unicode all of the time.

svn: r14091

src/gui/views/listview.py

@@ -60,7 +60,7 @@ import const
 import Utils
 from QuestionDialog import QuestionDialog, QuestionDialog2
 from gui.filtereditor import FilterEditor
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 
 #----------------------------------------------------------------
 #

src/gui/views/navigationview.py

@@ -47,7 +47,7 @@ import gtk
 #
 #----------------------------------------------------------------
 from gui.views.pageview import PageView
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 from Utils import navigation_label
 
 DISABLED = -1

src/gui/views/pageview.py

@@ -39,7 +39,7 @@ _LOG = logging.getLogger('.pageview')
 #
 #----------------------------------------------------------------
 import gtk
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #----------------------------------------------------------------
 #

src/gui/views/placebaseview.py

@@ -61,7 +61,7 @@ from gen.plug import CATEGORY_QR_PLACE
 # internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 
 #-------------------------------------------------------------------------

src/gui/views/treemodels/mediamodel.py

@@ -25,7 +25,7 @@
 #
 #-------------------------------------------------------------------------
 import time
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import logging
 log = logging.getLogger(".")
 

src/gui/views/treemodels/peoplemodel.py

@@ -33,8 +33,7 @@ TreeModel for the GRAMPS Person tree.
 #
 #-------------------------------------------------------------------------
 from __future__ import with_statement
-#from gettext import gettext as _
-from TransUtils import gettext as _
+from gen.ggettext import gettext as _
 import time
 import cgi
 

src/gui/views/treemodels/placebasemodel.py

@@ -50,7 +50,7 @@ import GrampsLocale
 # internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/gui/views/treemodels/placetreemodel.py

@@ -52,7 +52,7 @@ from gui.views.treemodels.treebasemodel import TreeBaseModel
 # Internationalization
 #
 #-------------------------------------------------------------------------
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/gui/views/treemodels/treebasemodel.py

@@ -33,7 +33,7 @@ This module provides the model that is used for all hierarchical treeviews.
 from __future__ import with_statement
 import time
 import locale
-from gettext import gettext as _
+from gen.ggettext import gettext as _
 import logging
 
 _LOG = logging.getLogger(".gui.treebasemodel")