wxGUI/translations: different way of accessing gettext underscore ('_') function (attempt to fix https://trac.osgeo.org/grass/ticket/1739 for grasswxpy)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57219 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/animation/anim.py

@@ -16,6 +16,7 @@ This program is free software under the GNU General Public License
 
 import wx
 from utils import Orientation, ReplayMode
+from core.utils import _
 
 class Animation(wx.EvtHandler):
     """!Animation class specifies which frame to show at which instance."""

gui/wxpython/animation/controller.py

@@ -28,6 +28,7 @@ except ImportError:
     hasVisvis = False
 
 from core.gcmd import GException, GError, GMessage
+from core.utils import _
 import grass.script as grass
 
 from temporal_manager import TemporalManager
@@ -564,9 +565,6 @@ class AnimationController(wx.EvtHandler):
 
 
 #def test():
-#    import gettext
-#    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-#
 #    import grass.script as grass
 #    import wx
 #    app = wx.PySimpleApp()

gui/wxpython/animation/dialogs.py

@@ -36,6 +36,7 @@ from core import globalvar
 from gui_core import gselect
 from gui_core.dialogs import MapLayersDialog, GetImageHandlers
 from core.settings import UserSettings
+from core.utils import _
 
 from utils import TemporalMode, validateTimeseriesName, validateMapNames
 from nviztask import NvizTask
@@ -1242,8 +1243,6 @@ class ExportDialog(wx.Dialog):
 
 def test():
     import wx.lib.inspection
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
     import grass.script as grass
 

gui/wxpython/animation/frame.py

@@ -29,6 +29,7 @@ if __name__ == '__main__':
 from core import globalvar
 from gui_core.widgets import IntegerValidator
 from core.gcmd import RunCommand
+from core.utils import _
 
 from mapwindow import AnimationWindow, BitmapProvider, BitmapPool
 from controller import AnimationController
@@ -512,8 +513,6 @@ class TimeAnimationSlider(AnimationSliderBase):
             self.Layout()
 
 def test():
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
     import grass.script as grass
 

gui/wxpython/animation/g.gui.animation.py

@@ -54,7 +54,6 @@ import os
 import sys
 
 import wx
-import gettext
 
 import grass.script as grass
 
@@ -64,11 +63,10 @@ if __name__ == '__main__':
 from core.settings import UserSettings
 from core.globalvar import CheckWxVersion
 from core.giface import StandaloneGrassInterface
+from core.utils import _
 from animation.frame import AnimationFrame, MAX_COUNT
 
 def main():
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-
     options, flags = grass.parser()
 
     rast = options['rast']

gui/wxpython/animation/mapwindow.py

@@ -24,6 +24,7 @@ import grass.script as grass
 from core.gcmd import RunCommand
 from core.debug import Debug
 from core.settings import UserSettings
+from core.utils import _
 
 from grass.pydispatch.signal import Signal
 

gui/wxpython/animation/nviztask.py

@@ -27,7 +27,7 @@ if __name__ == '__main__':
 
 from core.workspace import ProcessWorkspaceFile
 from core.gcmd import RunCommand, GException
-from core.utils import GetLayerNameFromCmd, CmdToTuple
+from core.utils import GetLayerNameFromCmd, CmdToTuple, _
 from grass.script import task as gtask
 from grass.script import core as grass
 
@@ -198,8 +198,6 @@ class NvizTask:
 
 
 def test():
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
     nviz = NvizTask('/home/anna/testy/nviz/t12.gxw')
     # nviz = NvizState('/home/anna/testy/nviz/t3.gxw')

gui/wxpython/animation/temporal_manager.py

@@ -26,6 +26,7 @@ if __name__ == '__main__':
 import grass.script as grass
 import grass.temporal as tgis
 from core.gcmd import GException
+from core.utils import _
 from utils import validateTimeseriesName, TemporalType
 
 
@@ -325,9 +326,7 @@ class TemporalManager(object):
         infoDict[id]['maps'] = maps
 
 def test():
-    import gettext
     from pprint import pprint
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
     temp = TemporalManager()
 

gui/wxpython/animation/toolbars.py

@@ -21,6 +21,7 @@ from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon import MetaIcon
 
 from anim import ReplayMode
+from core.utils import _
 
 ganimIcons = {
         'speed': MetaIcon(img = 'settings', label = _("Change animation speed")),

gui/wxpython/animation/utils.py

@@ -28,6 +28,7 @@ import grass.temporal as tgis
 import grass.script as grass
 
 from core.gcmd import GException
+from core.utils import _
 
 class TemporalMode:
     TEMPORAL = 1

gui/wxpython/core/gcmd.py

@@ -49,6 +49,10 @@ from grass.script import core as grass
 from core       import globalvar
 from core.debug import Debug
 
+# cannot import from the core.utils module to avoid cross dependencies
+import gettext
+_ = gettext.translation('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale')).ugettext
+
 def GetRealCmd(cmd):
     """!Return real command name - only for MS Windows
     """

gui/wxpython/core/gconsole.py

@@ -39,6 +39,7 @@ from grass.pydispatch.signal import Signal
 
 from core import globalvar
 from core.gcmd import CommandThread, GError, GException
+from core.utils import _
 from gui_core.forms import GUI
 from core.debug import Debug
 from core.settings import UserSettings

gui/wxpython/core/giface.py

@@ -19,6 +19,7 @@ import os
 from core.gconsole import GConsole, \
     EVT_CMD_OUTPUT, EVT_CMD_PROGRESS, EVT_CMD_RUN, EVT_CMD_DONE, \
     EVT_WRITE_LOG, EVT_WRITE_CMD_LOG, EVT_WRITE_WARNING, EVT_WRITE_ERROR
+from core.utils import _
 
 import grass.script as grass
 

gui/wxpython/core/globalvar.py

@@ -27,6 +27,10 @@ ETCSYMBOLDIR = os.path.join(ETCDIR, "gui", "images", "symbols")
 
 from core.debug import Debug
 
+# cannot import from the core.utils module to avoid cross dependencies
+import gettext
+_ = gettext.translation('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale')).ugettext
+
 if os.path.join(ETCDIR, "python") not in sys.path:
     sys.path.append(os.path.join(ETCDIR, "python"))
 

gui/wxpython/core/menutree.py

@@ -51,6 +51,7 @@ if __name__ == '__main__':
 from core.treemodel import TreeModel, ModuleNode
 from core.settings import UserSettings
 from core.toolboxes import expandAddons as expAddons
+from core.utils import _
 
 if not os.getenv("GISBASE"):
     sys.exit("GRASS is not running. Exiting...")
@@ -214,9 +215,6 @@ def printCommands(node, fh, itemSep, menuSep):
 
 
 if __name__ == "__main__":
-    # i18N
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
     action = 'strings'
     menu   = 'manager'

gui/wxpython/core/render.py

@@ -38,6 +38,7 @@ from grass.script import core as grass
 from grass.pydispatch.signal import Signal
 
 from core          import utils
+from core.utils import _
 from core.ws       import RenderWMSMgr
 from core.gcmd     import GException, GError, RunCommand
 from core.debug    import Debug

gui/wxpython/core/settings.py

@@ -26,7 +26,7 @@ import types
 
 from core       import globalvar
 from core.gcmd  import GException, GError
-from core.utils import GetSettingsPath, PathJoin, rgb2str
+from core.utils import GetSettingsPath, PathJoin, rgb2str, _
 
 class Settings:
     """!Generic class where to store settings"""

gui/wxpython/core/toolboxes.py

@@ -37,7 +37,7 @@ if __name__ == '__main__':
         sys.path.append(gui_wx_path)
 
 from core.globalvar import ETCWXDIR
-from core.utils import GetSettingsPath
+from core.utils import GetSettingsPath, _
 from core.gcmd import GError, RunCommand
 
 import grass.script.task as gtask

gui/wxpython/core/units.py

@@ -22,6 +22,8 @@ This program is free software under the GNU General Public License
 @author Martin Landa <landa.martin gmail.com>
 """
 
+from core.utils import _
+
 class BaseUnits:
     def __init__(self):
         self._units = dict()

gui/wxpython/core/utils.py

@@ -32,6 +32,11 @@ from core.gcmd  import RunCommand
 from core.debug import Debug
 # from core.settings import UserSettings
 
+# intended to be used also outside this module
+import gettext
+_ = gettext.translation('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale')).ugettext
+
+
 def normalize_whitespace(text):
     """!Remove redundant whitespace from a string"""
     return string.join(string.split(text), ' ')

gui/wxpython/core/workspace.py

@@ -20,7 +20,7 @@ import os
 
 import wx
 
-from core.utils     import normalize_whitespace
+from core.utils     import normalize_whitespace, _
 from core.settings  import UserSettings
 from core.gcmd      import EncodeString, GetDefaultEncoding
 from nviz.main      import NvizSettings

gui/wxpython/core/ws.py

@@ -28,6 +28,7 @@ from core          import utils
 from core.debug    import Debug
 
 from core.gconsole import CmdThread, GStderr, EVT_CMD_DONE, EVT_CMD_OUTPUT
+from core.utils import _
 
 try:
     haveGdal = True

gui/wxpython/dbmgr/base.py

@@ -46,7 +46,7 @@ import grass.script as grass
 
 from dbmgr.sqlbuilder import SQLBuilderSelect, SQLBuilderUpdate
 from core.gcmd        import RunCommand, GException, GError, GMessage, GWarning
-from core.utils       import ListOfCatsToRange
+from core.utils       import ListOfCatsToRange, _
 from gui_core.dialogs import CreateNewVector
 from dbmgr.vinfo      import VectorDBInfo, GetUnicodeValue, CreateDbInfoDesc
 from core.debug       import Debug

gui/wxpython/dbmgr/dialogs.py

@@ -21,6 +21,7 @@ import os
 import types
 
 from core import globalvar
+from core.utils import _
 import wx
 import wx.lib.scrolledpanel as scrolled
 

gui/wxpython/dbmgr/g.gui.dbmgr.py

@@ -32,8 +32,6 @@ import os
 import sys
 
 import  wx
-import gettext
-gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
 import grass.script as grass
 
@@ -41,6 +39,7 @@ gui_wx_path = os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython')
 if gui_wx_path not in sys.path:
     sys.path.append(gui_wx_path)
 
+from core.utils import _
 from dbmgr.manager import AttributeManager
 
 def main():

gui/wxpython/dbmgr/manager.py

@@ -33,6 +33,7 @@ import grass.script as grass
 from core             import globalvar
 from core.gcmd        import GMessage
 from core.debug       import Debug
+from core.utils import _
 from dbmgr.base       import DbMgrBase
 from gui_core.widgets import GNotebook
                 

gui/wxpython/dbmgr/sqlbuilder.py

@@ -33,6 +33,7 @@ if __name__ == "__main__":
         sys.path.append(gui_wx_path)
 
 from core import globalvar
+from core.utils import _
 import wx
 
 from core.gcmd   import RunCommand, GError, GMessage
@@ -729,9 +730,6 @@ if __name__ == "__main__":
         print >>sys.stderr, __doc__
         sys.exit()
 
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
-
     app = wx.App(0)
     sqlb = sqlBuilder(parent = None, vectmap = sys.argv[2], layer = layer)
     sqlb.Show()

gui/wxpython/dbmgr/vinfo.py

@@ -22,6 +22,7 @@ import wx
 from gui_core.gselect import VectorDBInfo as VectorDBInfoBase
 from core.gcmd        import RunCommand
 from core.settings    import UserSettings
+from core.utils import _
 import grass.script as grass
 
 def GetUnicodeValue(value):

gui/wxpython/gcp/manager.py

@@ -42,6 +42,7 @@ import grass.script as grass
 from core              import globalvar
 from core              import utils
 from core.render       import Map
+from core.utils import _
 from gui_core.gselect  import Select, LocationSelect, MapsetSelect
 from gui_core.dialogs  import GroupDialog
 from core.gcmd         import RunCommand, GMessage, GError, GWarning

gui/wxpython/gcp/mapdisplay.py

@@ -27,6 +27,7 @@ from mapdisp.toolbars  import MapToolbar
 from gcp.toolbars      import GCPDisplayToolbar, GCPManToolbar
 from mapdisp.gprint    import PrintOptions
 from core.gcmd         import GMessage
+from core.utils import _
 from gui_core.dialogs  import GetImageHandlers, ImageSizeDialog
 from gui_core.mapdisp  import SingleMapFrame
 from core.settings     import UserSettings

gui/wxpython/gcp/toolbars.py

@@ -21,6 +21,7 @@ import sys
 import wx
 
 from core              import globalvar
+from core.utils import _
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icon              import MetaIcon
     

gui/wxpython/gis_set.py

@@ -29,7 +29,6 @@ import codecs
 import getpass
 
 ### i18N
-import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
 if __name__ == "__main__":
@@ -46,7 +45,7 @@ from grass.script import core as grass
 
 from gui_core.ghelp import HelpFrame
 from core.gcmd      import GMessage, GError, DecodeString, RunCommand, GWarning
-from core.utils     import GetListOfLocations, GetListOfMapsets
+from core.utils     import GetListOfLocations, GetListOfMapsets, _
 from location_wizard.dialogs import RegionDef
 from gui_core.dialogs import TextEntryDialog
 from gui_core.widgets import GenericValidator
@@ -78,9 +77,7 @@ class GRASSStartup(wx.Frame):
         self.panel = scrolled.ScrolledPanel(parent = self, id = wx.ID_ANY)
         
         # i18N
-        import gettext
-        gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-
+        
         #
         # graphical elements
         #
@@ -1023,8 +1020,6 @@ if __name__ ==  "__main__":
     if os.getenv("GISBASE") is None:
         sys.exit("Failed to start GUI, GRASS GIS is not running.")
         
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     
     GRASSStartUp = StartUp(0)
     GRASSStartUp.MainLoop()

gui/wxpython/gmodeler/dialogs.py

@@ -31,6 +31,7 @@ import wx.lib.mixins.listctrl as listmix
 
 from core                 import globalvar
 from core                 import utils
+from core.utils import _
 from gui_core.widgets     import SearchModuleWidget, SimpleValidator
 from core.gcmd            import GError, EncodeString
 from gui_core.dialogs     import SimpleDialog, MapLayersDialogForModeler

gui/wxpython/gmodeler/frame.py

@@ -33,6 +33,7 @@ from   wx.lib import ogl
 import wx.lib.flatnotebook    as FN
 
 from core                 import globalvar
+from core.utils import _
 from gui_core.widgets     import GNotebook
 from core.gconsole        import GConsole, \
     EVT_CMD_RUN, EVT_CMD_DONE, EVT_CMD_PREPARE, EVT_CMD_RUN, EVT_CMD_DONE

gui/wxpython/gmodeler/g.gui.gmodeler.py

@@ -38,7 +38,6 @@ import os
 import sys
 
 import  wx
-import gettext
 
 import grass.script as grass
 
@@ -48,11 +47,10 @@ if gui_wx_path not in sys.path:
 
 from core.giface import StandaloneGrassInterface
 from core.globalvar import CheckWxVersion
+from core.utils import _
 from gmodeler.frame import ModelFrame
 
 def main():
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     
     app = wx.PySimpleApp()
     if not CheckWxVersion([2, 9]):

gui/wxpython/gmodeler/model.py

@@ -41,6 +41,7 @@ from wx.lib import ogl
 
 from core                import globalvar
 from core                import utils
+from core.utils import _
 from core.gcmd           import GMessage, GException, GError, RunCommand, EncodeString, GWarning, GetDefaultEncoding
 from core.settings       import UserSettings
 from gui_core.forms      import GUI, CmdPanel

gui/wxpython/gmodeler/preferences.py

@@ -21,6 +21,7 @@ import wx.lib.colourselect    as csel
 from core                 import globalvar
 from gui_core.preferences import PreferencesBaseDialog
 from core.settings        import UserSettings
+from core.utils import _
 
 class PreferencesDialog(PreferencesBaseDialog):
     """!User preferences dialog"""

gui/wxpython/gmodeler/pystc.py

@@ -19,6 +19,7 @@ import keyword
 
 import wx
 from wx import stc
+from core.utils import _
 
 
 class PyStc(stc.StyledTextCtrl):

gui/wxpython/gmodeler/toolbars.py

@@ -20,6 +20,7 @@ import sys
 import wx
 
 from core              import globalvar
+from core.utils import _
 from gui_core.toolbars import BaseToolbar, BaseIcons
 
 from icons.icon        import MetaIcon

gui/wxpython/gui_core/dialogs.py

@@ -51,7 +51,7 @@ from core.gcmd        import GError, RunCommand, GMessage
 from gui_core.gselect import LocationSelect, MapsetSelect, Select, OgrTypeSelect, GdalSelect, MapsetSelect
 from gui_core.forms   import GUI
 from gui_core.widgets import SingleSymbolPanel, GListCtrl, SimpleValidator
-from core.utils       import GetLayerNameFromCmd, GetValidLayerName
+from core.utils       import GetLayerNameFromCmd, GetValidLayerName, _
 from core.settings    import UserSettings, GetDisplayVectSettings
 from core.debug       import Debug
 

gui/wxpython/gui_core/forms.py

@@ -94,6 +94,7 @@ from gui_core.ghelp   import HelpPanel
 from gui_core         import gselect
 from core             import gcmd
 from core             import utils
+from core.utils import _
 from core.settings    import UserSettings
 from gui_core.widgets import FloatValidator, GNotebook, FormNotebook, FormListbook
 
@@ -2340,8 +2341,6 @@ class GrassGUIApp(wx.App):
         return True
 
 if __name__ == "__main__":
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     
     if len(sys.argv) == 1:
         sys.exit(_("usage: %s <grass command>") % sys.argv[0])

gui/wxpython/gui_core/ghelp.py

@@ -33,6 +33,7 @@ except ImportError:
 import grass.script as grass
 
 from core             import globalvar
+from core.utils import _
 from core.gcmd        import GError, DecodeString
 from gui_core.widgets import FormListbook, ScrolledPanel
 from core.debug       import Debug

gui/wxpython/gui_core/goutput.py

@@ -39,6 +39,7 @@ from core.gconsole   import GConsole, \
     EVT_WRITE_LOG, EVT_WRITE_CMD_LOG, EVT_WRITE_WARNING, EVT_WRITE_ERROR
 from gui_core.prompt import GPromptSTC
 from core.settings   import UserSettings
+from core.utils import _
 from gui_core.widgets import SearchModuleWidget
 
 

gui/wxpython/gui_core/gselect.py

@@ -58,7 +58,7 @@ from gui_core.widgets  import ManageSettingsWidget
 from core.gcmd     import RunCommand, GError, GMessage
 from core.utils    import GetListOfLocations, GetListOfMapsets, GetFormats
 from core.utils    import GetSettingsPath, GetValidLayerName, ListSortLower
-from core.utils    import GetVectorNumberOfLayers
+from core.utils    import GetVectorNumberOfLayers, _
 from core.settings import UserSettings
 from core.debug    import Debug
 

gui/wxpython/gui_core/mapdisp.py

@@ -27,6 +27,7 @@ import wx.aui
 
 from core        import globalvar
 from core.debug  import Debug
+from core.utils import _
 
 from grass.script import core as grass
 

gui/wxpython/gui_core/mapwindow.py

@@ -22,6 +22,7 @@ import wx
 
 from core.settings import UserSettings
 from core.gcmd     import GError
+from core.utils import _
 
 from grass.script import core as grass
 

gui/wxpython/gui_core/menu.py

@@ -24,6 +24,7 @@ import wx
 from core              import globalvar
 from core              import utils
 from core.gcmd         import EncodeString
+from core.utils import _
 from gui_core.widgets  import SearchModuleWidget
 from gui_core.treeview import CTreeView
 

gui/wxpython/gui_core/preferences.py

@@ -46,7 +46,7 @@ from grass.script import core as grass
 
 from core          import globalvar
 from core.gcmd     import RunCommand
-from core.utils    import ListOfMapsets, GetColorTables, ReadEpsgCodes, StoreEnvVariable
+from core.utils    import ListOfMapsets, GetColorTables, ReadEpsgCodes, StoreEnvVariable, _
 from core.settings import UserSettings
 from gui_core.dialogs import SymbolDialog
 from gui_core.widgets import IntegerValidator

gui/wxpython/gui_core/prompt.py

@@ -32,6 +32,7 @@ from grass.pydispatch.signal import Signal
 from core          import globalvar
 from core          import utils
 from core.gcmd     import EncodeString, DecodeString, GetRealCmd
+from core.utils import _
 
 
 class GPrompt(object):

gui/wxpython/gui_core/query.py

@@ -22,6 +22,7 @@ if __name__ == '__main__':
     if gui_wx_path not in sys.path:
         sys.path.append(gui_wx_path)
 
+from core.utils import _
 from gui_core.treeview import TreeListView
 from core.treemodel import TreeModel, DictNode
 

gui/wxpython/gui_core/toolbars.py

@@ -22,6 +22,7 @@ import wx
 
 from core               import globalvar
 from core.debug         import Debug
+from core.utils import _
 from icons.icon         import MetaIcon
 
 BaseIcons = {

gui/wxpython/gui_core/treeview.py

@@ -31,6 +31,7 @@ if __name__ == '__main__':
 
 from core.globalvar import hasAgw
 from core.treemodel import TreeModel, DictNode
+from core.utils import _
 
 from grass.pydispatch.signal import Signal
 

gui/wxpython/gui_core/widgets.py

@@ -52,6 +52,7 @@ except ImportError:
 from grass.pydispatch.signal import Signal
 
 from core        import globalvar
+from core.utils import _
 from core.gcmd   import GMessage, GError
 from core.debug  import Debug
 

gui/wxpython/iclass/dialogs.py

@@ -26,6 +26,7 @@ import wx.lib.mixins.listctrl as listmix
 import wx.lib.scrolledpanel as scrolled
 
 from core               import globalvar
+from core.utils import _
 from core.settings      import UserSettings
 from core.gcmd          import GMessage
 from gui_core.dialogs   import SimpleDialog, GroupDialog

gui/wxpython/iclass/digit.py

@@ -22,6 +22,7 @@ from vdigit.mapwindow import VDigitWindow
 from vdigit.wxdigit   import IVDigit
 from vdigit.wxdisplay import DisplayDriver, TYPE_AREA
 from core.gcmd        import GWarning
+from core.utils import _
 try:
     from grass.lib.gis    import G_verbose, G_set_verbose
     from grass.lib.vector import *

gui/wxpython/iclass/frame.py

@@ -21,6 +21,7 @@ import os
 import sys
 import copy
 import tempfile
+from core.utils import _
 
 if __name__ == "__main__":
     gui_wx_path = os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython')
@@ -1297,11 +1298,8 @@ class MapManager:
                 self.toolbar.choice.SetString(idx, self._addSuffix(alias))
 
 def test():
-    import gettext
     import core.render as render
-    
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-    
+
     app = wx.PySimpleApp()
     wx.InitAllImageHandlers()
     

gui/wxpython/iclass/g.gui.iclass.py

@@ -51,7 +51,6 @@ import os
 import sys
 
 import  wx
-import gettext
 
 import grass.script as grass
 
@@ -63,6 +62,7 @@ if __name__ == '__main__':
 from core.settings  import UserSettings
 from core.globalvar import CheckWxVersion
 from core.giface    import StandaloneGrassInterface
+from core.utils import _
 from iclass.frame   import IClassMapFrame
 
 def main():
@@ -113,7 +113,6 @@ def main():
     app.MainLoop()
     
 if __name__ == '__main__':
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     grass.set_raise_on_error(False)
     options, flags = grass.parser()
     main()

gui/wxpython/iclass/plots.py

@@ -18,6 +18,7 @@ for details.
 import wx
 import wx.lib.plot as plot
 import wx.lib.scrolledpanel as scrolled
+from core.utils import _
 
 class PlotPanel(scrolled.ScrolledPanel):
     """!Panel for drawing multiple plots.

gui/wxpython/iclass/statistics.py

@@ -20,6 +20,7 @@ import os
 from ctypes import *
 
 import grass.script as grass
+from core.utils import _
 
 try:
     from grass.lib.imagery import *

gui/wxpython/iclass/toolbars.py

@@ -20,6 +20,7 @@ for details.
 
 import wx
 
+from core.utils import _
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon import MetaIcon
 from iclass.dialogs import IClassMapDialog

gui/wxpython/icons/icon.py

@@ -22,6 +22,7 @@ import copy
 import wx
 
 from core.settings import UserSettings
+from core.utils import _
 
 # default icon set
 import grass_icons

gui/wxpython/lmgr/frame.py

@@ -44,7 +44,7 @@ from grass.script          import core as grass
 
 from core.gcmd             import RunCommand, GError, GMessage, GException
 from core.settings         import UserSettings, GetDisplayVectSettings
-from core.utils            import SetAddOnPath, GetLayerNameFromCmd, command2ltype
+from core.utils            import SetAddOnPath, GetLayerNameFromCmd, command2ltype, _
 from gui_core.preferences  import MapsetAccess, PreferencesDialog
 from lmgr.layertree        import LayerTree, LMIcons
 from lmgr.menudata         import LayerManagerMenuData, LayerManagerModuleTree

gui/wxpython/lmgr/layertree.py

@@ -37,7 +37,7 @@ from gui_core.forms       import GUI
 from mapdisp.frame        import MapFrame
 from core.render          import Map
 from wxplot.histogram     import HistogramPlotFrame
-from core.utils           import GetLayerNameFromCmd, ltype2command
+from core.utils           import GetLayerNameFromCmd, ltype2command, _
 from wxplot.profile       import ProfileFrame
 from core.debug           import Debug
 from core.settings        import UserSettings, GetDisplayVectSettings

gui/wxpython/lmgr/menudata.py

@@ -21,6 +21,7 @@ from core.menutree  import MenuTreeModelBuilder
 from core.toolboxes import getMenudataFile
 from core.globalvar import ETCWXDIR
 from core.gcmd import GError
+from core.utils import _
 
 
 class LayerManagerMenuData(MenuTreeModelBuilder):

gui/wxpython/lmgr/pyshell.py

@@ -24,6 +24,7 @@ from wx.py.shell   import Shell as PyShell
 from wx.py.version import VERSION
 
 import grass.script as grass
+from core.utils import _
 
 class PyShellWindow(wx.Panel):
     """!Python Shell Window"""

gui/wxpython/lmgr/toolbars.py

@@ -25,6 +25,7 @@ This program is free software under the GNU General Public License
 from core.gcmd          import RunCommand
 from gui_core.toolbars  import BaseToolbar, BaseIcons
 from icons.icon         import MetaIcon
+from core.utils import _
 
 class LMWorkspaceToolbar(BaseToolbar):
     """!Layer Manager `workspace` toolbar

gui/wxpython/location_wizard/dialogs.py

@@ -30,6 +30,7 @@ if __name__ == '__main__':
 
 from core                 import globalvar
 from core.gcmd            import RunCommand
+from core.utils import _
 from location_wizard.base import BaseClass
 
 from grass.script import core as grass
@@ -620,10 +621,8 @@ class SelectTransformDialog(wx.Dialog):
 
 def testRegionDef():
     import sys
-    import gettext
     import wx.lib.inspection
     import grass.script as grass
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
     app = wx.PySimpleApp()
 

gui/wxpython/location_wizard/wizard.py

@@ -41,6 +41,7 @@ import wx.lib.scrolledpanel as scrolled
 
 from core                    import globalvar
 from core                    import utils
+from core.utils import _
 from core.gcmd               import RunCommand, GError, GMessage, GWarning
 from gui_core.widgets        import GenericValidator
 from location_wizard.base    import BaseClass

gui/wxpython/mapdisp/frame.py

@@ -43,7 +43,7 @@ from mapdisp.toolbars   import MapToolbar, NvizIcons
 from mapdisp.gprint     import PrintOptions
 from core.gcmd          import GError, GMessage
 from dbmgr.dialogs      import DisplayAttributesDialog
-from core.utils         import ListOfCatsToRange, GetLayerNameFromCmd
+from core.utils         import ListOfCatsToRange, GetLayerNameFromCmd, _
 from gui_core.dialogs   import GetImageHandlers, ImageSizeDialog, DecorationDialog, TextLayerDialog, \
                                DECOR_DIALOG_LEGEND, DECOR_DIALOG_BARSCALE
 from core.debug         import Debug

gui/wxpython/mapdisp/gprint.py

@@ -19,6 +19,7 @@ This program is free software under the GNU General Public License
 import  wx
 
 from core.gcmd import GMessage
+from core.utils import _
 
 class MapPrint(wx.Printout):
     def __init__(self, canvas):

gui/wxpython/mapdisp/main.py

@@ -41,6 +41,7 @@ from core          import utils
 from core.giface   import StandaloneGrassInterface
 from core.gcmd     import RunCommand
 from core.render   import Map, MapLayer
+from core.utils import _
 from mapdisp.frame import MapFrame
 from grass.script  import core as grass
 from core.debug    import Debug
@@ -373,8 +374,6 @@ if __name__ == "__main__":
         except ValueError:
             pass
 
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     
     grass.verbose(_("Starting map display <%s>...") % (monName))
 

gui/wxpython/mapdisp/mapwindow.py

@@ -37,7 +37,7 @@ from core.gcmd          import RunCommand, GException, GError, GMessage
 from core.debug         import Debug
 from core.settings      import UserSettings
 from gui_core.mapwindow import MapWindow
-from core.utils         import GetGEventAttribsForHandler
+from core.utils         import GetGEventAttribsForHandler, _
 
 try:
     import grass.lib.gis as gislib

gui/wxpython/mapdisp/statusbar.py

@@ -39,6 +39,7 @@ import wx
 from core          import utils
 from core.gcmd     import GMessage, RunCommand
 from core.settings import UserSettings
+from core.utils import _
 
 from grass.script  import core as grass
 

gui/wxpython/mapdisp/toolbars.py

@@ -22,6 +22,7 @@ from gui_core.toolbars import BaseToolbar, BaseIcons
 from nviz.main         import haveNviz
 from vdigit.main       import haveVDigit
 from icons.icon        import MetaIcon
+from core.utils import _
 
 MapIcons =  {
     'query'      : MetaIcon(img = 'info',

gui/wxpython/mapswipe/dialogs.py

@@ -17,6 +17,7 @@ This program is free software under the GNU General Public License
 import wx
 
 from core               import globalvar
+from core.utils import _
 from gui_core.dialogs   import SimpleDialog
 from gui_core           import gselect
 from gui_core.widgets   import SimpleValidator

gui/wxpython/mapswipe/frame.py

@@ -27,6 +27,7 @@ from core.render        import Map
 from mapdisp            import statusbar as sb
 from core.debug         import Debug
 from core.gcmd          import GError, GMessage
+from core.utils import _
 
 from mapswipe.toolbars  import SwipeMapToolbar, SwipeMainToolbar, SwipeMiscToolbar
 from mapswipe.mapwindow import SwipeBufferedWindow

gui/wxpython/mapswipe/g.gui.mapswipe.py

@@ -49,7 +49,6 @@ import os
 import sys
 
 import  wx
-import gettext
 
 import grass.script as grass
 
@@ -61,12 +60,11 @@ if __name__ == '__main__':
 from core.settings import UserSettings
 from core.globalvar import CheckWxVersion
 from core.giface import StandaloneGrassInterface
+from core.utils import _
 from mapswipe.frame import SwipeMapFrame
 
 
 def main():
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-
     driver = UserSettings.Get(group = 'display', key = 'driver', subkey = 'type')
     if driver == 'png':
         os.environ['GRASS_RENDER_IMMEDIATE'] = 'png'

gui/wxpython/mapswipe/mapwindow.py

@@ -20,6 +20,7 @@ This program is free software under the GNU General Public License
 import wx
 
 from core.debug import Debug
+from core.utils import _
 from mapdisp.mapwindow import BufferedWindow
 
 

gui/wxpython/mapswipe/toolbars.py

@@ -20,6 +20,8 @@ import wx
 
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon import MetaIcon
+from core.utils import _
+
 
 swipeIcons = {
         'tools': MetaIcon(img = 'tools', label = _("Tools")),

gui/wxpython/modules/colorrules.py

@@ -36,6 +36,7 @@ import grass.script as grass
 
 from core             import globalvar
 from core             import utils
+from core.utils import _
 from core.gcmd        import GMessage, RunCommand, GError
 from gui_core.gselect import Select, LayerSelect, ColumnSelect, VectorDBInfo
 from core.render      import Map

gui/wxpython/modules/extensions.py

@@ -27,7 +27,7 @@ from grass.script import task as gtask
 
 from core             import globalvar
 from core.gcmd        import GError, RunCommand, GException
-from core.utils       import SetAddOnPath
+from core.utils       import SetAddOnPath, _
 from core.menutree    import TreeModel, ModuleNode
 from gui_core.widgets import GListCtrl, SearchModuleWidget
 from gui_core.treeview import CTreeView

gui/wxpython/modules/histogram.py

@@ -25,7 +25,7 @@ from core                 import globalvar
 from core.render          import Map
 from gui_core.forms       import GUI
 from mapdisp.gprint       import PrintOptions
-from core.utils           import GetLayerNameFromCmd
+from core.utils           import GetLayerNameFromCmd, _
 from gui_core.dialogs     import GetImageHandlers, ImageSizeDialog
 from gui_core.preferences import DefaultFontDialog
 from core.debug           import Debug

gui/wxpython/modules/mcalc_builder.py

@@ -31,6 +31,7 @@ if __name__ == "__main__":
 from core             import globalvar
 from core.gcmd        import GError, RunCommand
 from core.giface      import StandaloneGrassInterface
+from core.utils import _
 from gui_core.gselect import Select
 from gui_core.forms   import GUI
 from core.settings    import UserSettings
@@ -595,8 +596,6 @@ class MapCalcFrame(wx.Frame):
         self.Destroy()
 
 if __name__ == "__main__":
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
     
     app = wx.App(0)
     frame = MapCalcFrame(parent = None, cmd = 'r.mapcalc', giface = StandaloneGrassInterface())

gui/wxpython/modules/vclean.py

@@ -27,6 +27,7 @@ if __name__ == '__main__':
 
 from core.gcmd        import RunCommand, GError
 from core             import globalvar
+from core.utils import _
 from gui_core.gselect import Select
 from core.settings    import UserSettings
 from grass.script import core as grass

gui/wxpython/nviz/animation.py

@@ -20,6 +20,7 @@ import copy
 import wx
 
 from grass.pydispatch.signal import Signal
+from core.utils import _
 
 class Animation:
     """!Class represents animation as a sequence of states (views).

gui/wxpython/nviz/mapwindow.py

@@ -42,7 +42,7 @@ from nviz.workspace     import NvizSettings
 from nviz.animation     import Animation
 from nviz               import wxnviz
 from core.globalvar     import CheckWxVersion
-from core.utils         import str2rgb
+from core.utils         import str2rgb, _
 
 wxUpdateProperties, EVT_UPDATE_PROP  = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW  = NewEvent()

gui/wxpython/nviz/preferences.py

@@ -24,6 +24,7 @@ import wx.lib.colourselect as csel
 
 from core                 import globalvar
 from core.settings        import UserSettings
+from core.utils import _
 from gui_core.preferences import PreferencesBaseDialog
 
 class NvizPreferencesDialog(PreferencesBaseDialog):

gui/wxpython/nviz/tools.py

@@ -46,6 +46,7 @@ except ImportError:
 import grass.script as grass
 
 from core               import globalvar
+from core.utils import _
 from gui_core.gselect   import VectorDBInfo
 from core.gcmd          import GMessage, RunCommand
 from modules.colorrules import ThematicVectorTable

gui/wxpython/nviz/workspace.py

@@ -17,6 +17,7 @@ This program is free software under the GNU General Public License
 import copy
 
 from core.settings import UserSettings
+from core.utils import _
 
 try:
     from nviz      import wxnviz

gui/wxpython/nviz/wxnviz.py

@@ -48,6 +48,7 @@ from grass.lib.nviz     import *
 from grass.lib.raster   import *
 
 from core.debug import Debug
+from core.utils import _
 import grass.script as grass
 
 log      = None

gui/wxpython/psmap/dialogs.py

@@ -52,6 +52,7 @@ except ImportError:
 import grass.script as grass
 
 from core               import globalvar
+from core.utils import _
 from dbmgr.vinfo        import VectorDBInfo
 from gui_core.gselect   import Select
 from core.gcmd          import RunCommand, GError, GMessage

gui/wxpython/psmap/frame.py

@@ -35,6 +35,7 @@ from core.gconsole      import CmdThread, EVT_CMD_DONE
 from psmap.toolbars     import PsMapToolbar
 from core.gcmd          import RunCommand, GError, GMessage
 from core.settings      import UserSettings
+from core.utils import _
 from gui_core.forms     import GUI
 from gui_core.dialogs   import HyperlinkDialog
 from gui_core.ghelp     import ShowAboutDialog

gui/wxpython/psmap/g.gui.psmap.py

@@ -34,7 +34,6 @@
 
 import os
 import sys
-import gettext
 
 import  wx
 
@@ -45,6 +44,7 @@ if wxbase not in sys.path:
     sys.path.append(wxbase)
 
 from core.globalvar import CheckWxVersion
+from core.utils import _
 from psmap.frame        import PsMapFrame
 from psmap.instructions import Instruction
 

gui/wxpython/psmap/instructions.py

@@ -41,7 +41,7 @@ import wx
 import grass.script as grass
 
 from core.gcmd          import RunCommand, GError, GMessage, GWarning
-from core.utils         import CmdToTuple, GetCmdString
+from core.utils         import CmdToTuple, GetCmdString, _
 from dbmgr.vinfo        import VectorDBInfo
 from psmap.utils        import *
 

gui/wxpython/psmap/toolbars.py

@@ -20,6 +20,7 @@ import sys
 import wx
 
 from core              import globalvar
+from core.utils import _
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon        import MetaIcon
 from core.globalvar    import ETCIMGDIR

gui/wxpython/psmap/utils.py

@@ -28,6 +28,7 @@ except ImportError:
 
 import grass.script as grass
 from core.gcmd          import RunCommand
+from core.utils import _
 
 class Rect2D(wx.Rect2D):
     """!Class representing rectangle with floating point values.

gui/wxpython/rlisetup/frame.py

@@ -9,6 +9,7 @@ import wx
 import os
 
 from core import globalvar, gcmd
+from core.utils import _
 from grass.script import core as grass
 from rlisetup.functions import retRLiPath
 from rlisetup.wizard import RLIWizard

gui/wxpython/rlisetup/g.gui.rlisetup.py

@@ -28,7 +28,6 @@
 
 import os
 import sys
-import gettext
 
 import  wx
 import grass.script as grass
@@ -39,12 +38,11 @@ if wxbase not in sys.path:
 
 from core.giface import StandaloneGrassInterface
 from core.globalvar import CheckWxVersion
+from core.utils import _
 from rlisetup.frame import RLiSetupFrame
 
 
 def main():
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'),
-                    unicode = True)
     app = wx.PySimpleApp()
     if not CheckWxVersion([2, 9]):
         wx.InitAllImageHandlers()

gui/wxpython/rlisetup/wizard.py

@@ -33,6 +33,7 @@ import wx.lib.scrolledpanel as scrolled
 
 from gui_core import gselect
 from core import gcmd
+from core.utils import _
 from location_wizard.wizard import TitledPage as TitledPage
 from rlisetup.functions import checkValue, retRLiPath
 from grass.script import core as grass