i18N: cleanup gettext usage for Python code (fixes https://trac.osgeo.org/grass/ticket/3790) (contributed by pmav99)

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

doc/gui/wxpython/example/dialogs.py

@@ -16,10 +16,15 @@ for details.
 
 import wx
 
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
+# NOTE: in this particular case, we don't really need the grass library;
+# NOTE: we import it just for the side effects of gettext.install()
+import grass
+
 from core import globalvar
 from gui_core.dialogs import SimpleDialog
 from gui_core import gselect
-from core.utils import _
 
 
 class ExampleMapDialog(SimpleDialog):

doc/gui/wxpython/example/frame.py

@@ -23,6 +23,10 @@ import wx
 if __name__ == "__main__":
     sys.path.append(os.path.join(os.environ['GISBASE'], "etc", "gui", "wxpython"))
 
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
+from grass.script import core as gcore
+
 from gui_core.mapdisp import SingleMapFrame
 from mapwin.buffered import BufferedMapWindow
 from mapwin.base import MapWindowProperties
@@ -30,9 +34,6 @@ from mapdisp import statusbar as sb
 from core.render import Map
 from core.debug import Debug
 from core.gcmd import RunCommand, GError
-from core.utils import _
-
-from grass.script import core as gcore
 
 from toolbars import ExampleMapToolbar, ExampleMiscToolbar, ExampleMainToolbar
 from dialogs import ExampleMapDialog

doc/gui/wxpython/example/g.gui.example.py

@@ -33,6 +33,9 @@ import os
 import sys
 import wx
 
+
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
 import grass.script.core as gcore
 
 if __name__ == '__main__':
@@ -42,7 +45,7 @@ if __name__ == '__main__':
 
 from core.globalvar import CheckWxVersion
 from core.giface import StandaloneGrassInterface
-from core.utils import _, GuiModuleMain
+from core.utils import GuiModuleMain
 from core.settings import UserSettings
 from example.frame import ExampleMapFrame
 

gui/wxpython/animation/anim.py

@@ -16,7 +16,6 @@ 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):

gui/wxpython/animation/controller.py

@@ -17,7 +17,6 @@ import os
 import wx
 
 from core.gcmd import GException, GError, GMessage
-from core.utils import _
 from grass.imaging import writeAvi, writeGif, writeIms, writeSwf
 from core.settings import UserSettings
 

gui/wxpython/animation/data.py

@@ -22,7 +22,6 @@ import copy
 from grass.script.utils import parse_key_val
 from grass.script import core as gcore
 
-from core.utils import _
 from core.gcmd import GException
 from animation.nviztask import NvizTask
 from animation.utils import validateMapNames, getRegisteredMaps, \

gui/wxpython/animation/dialogs.py

@@ -40,7 +40,6 @@ from gui_core.dialogs import MapLayersDialog, GetImageHandlers
 from gui_core.preferences import PreferencesBaseDialog
 from gui_core.forms import GUI
 from core.settings import UserSettings
-from core.utils import _
 from gui_core.gselect import Select
 from gui_core.widgets import FloatValidator
 from gui_core.wrap import SpinCtrl, CheckBox, TextCtrl, Button, \

gui/wxpython/animation/frame.py

@@ -30,7 +30,6 @@ from core import globalvar
 from gui_core.widgets import IntegerValidator
 from gui_core.wrap import StaticText, TextCtrl
 from core.gcmd import RunCommand
-from core.utils import _
 
 from animation.mapwindow import AnimationWindow
 from animation.provider import BitmapProvider, BitmapPool, \

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

@@ -66,7 +66,6 @@ def main():
     set_gui_path()
 
     from core.globalvar import CheckWxVersion
-    from core.utils import _
     from core.giface import StandaloneGrassInterface
     from core.layerlist import LayerList
     from animation.frame import AnimationFrame, MAX_COUNT

gui/wxpython/animation/nviztask.py

@@ -24,7 +24,7 @@ except ImportError:
 
 from core.workspace import ProcessWorkspaceFile
 from core.gcmd import RunCommand, GException
-from core.utils import GetLayerNameFromCmd, _
+from core.utils import GetLayerNameFromCmd
 from grass.script import task as gtask
 from core.settings import UserSettings
 

gui/wxpython/animation/provider.py

@@ -29,7 +29,7 @@ from multiprocessing import Process, Queue
 from core.gcmd import RunCommand, GException
 from core.settings import UserSettings
 from core.debug import Debug
-from core.utils import _, autoCropImageFromFile
+from core.utils import autoCropImageFromFile
 
 from animation.utils import HashCmd, HashCmds, GetFileFromCmd, GetFileFromCmds
 from gui_core.wrap import EmptyBitmap

gui/wxpython/animation/temporal_manager.py

@@ -25,7 +25,6 @@ import datetime
 import grass.script as grass
 import grass.temporal as tgis
 from core.gcmd import GException
-from core.utils import _
 from core.settings import UserSettings
 from animation.utils import validateTimeseriesName, TemporalType
 

gui/wxpython/animation/toolbars.py

@@ -20,7 +20,6 @@ This program is free software under the GNU General Public License
 import wx
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon import MetaIcon
-from core.utils import _
 from gui_core.simplelmgr import SimpleLmgrToolbar
 from animation.anim import ReplayMode
 

gui/wxpython/animation/utils.py

@@ -34,7 +34,6 @@ from grass.script.utils import encode
 from gui_core.wrap import EmptyBitmap
 
 from core.gcmd import GException
-from core.utils import _
 
 
 class TemporalMode:

gui/wxpython/core/gcmd.py

@@ -48,7 +48,7 @@ else:
     import fcntl
 
 from core.debug import Debug
-from core.globalvar import SCT_EXT, _
+from core.globalvar import SCT_EXT
 
 from grass.script import core as grass
 from grass.script.utils import decode

gui/wxpython/core/gconsole.py

@@ -46,7 +46,6 @@ 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

@@ -16,7 +16,6 @@ This program is free software under the GNU General Public License
 """
 
 import os
-from core.utils import _
 
 import grass.script as grass
 

gui/wxpython/core/globalvar.py

@@ -28,24 +28,12 @@ ICONDIR = os.path.join(GUIDIR, "icons")
 IMGDIR = os.path.join(GUIDIR, "images")
 SYMBDIR = os.path.join(IMGDIR, "symbols")
 
-from core.debug import Debug
-
-try:
-    # intended to be used also outside this module
-    import gettext
-    trans = gettext.translation('grasswxpy',
-                                os.path.join(os.getenv("GISBASE"),
-                                                       'locale')
-    )
-    _ = trans.gettext if sys.version_info.major >=3 else trans.ugettext
-except IOError:
-    # using no translation silently
-    def null_gettext(string):
-        return string
-    _ = null_gettext
-
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
 from grass.script.core import get_commands
 
+from core.debug import Debug
+
 
 def CheckWxPhoenix():
     if 'phoenix' in wx.version():

gui/wxpython/core/menutree.py

@@ -51,7 +51,6 @@ from core.toolboxes import expandAddons as expAddons
 from core.toolboxes import getMessages as getToolboxMessages
 from core.toolboxes import clearMessages as clearToolboxMessages
 from core.gcmd import GError
-from core.utils import _
 
 if not os.getenv("GISBASE"):
     sys.exit("GRASS is not running. Exiting...")

gui/wxpython/core/render.py

@@ -39,7 +39,6 @@ from grass.pydispatch.signal import Signal
 from grass.exceptions import CalledModuleError
 
 from core import utils
-from core.utils import _
 from core.ws import RenderWMSMgr
 from core.gcmd import GException, GError, RunCommand, EncodeString
 from core.debug import Debug

gui/wxpython/core/settings.py

@@ -27,7 +27,7 @@ import copy
 
 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:

gui/wxpython/core/toolboxes.py

@@ -83,25 +83,6 @@ def _getUserMainMenuFile():
     return userMainMenuFile
 
 
-def _(string):
-    """Get translated version of a string"""
-    # is attribute initialized to actual value?
-    if _.translate is None:
-        try:
-            # if not get the translate function named _
-            from core.utils import _ as actual_translate
-            # assign the imported function to translade attribute
-            _.translate = actual_translate
-        except ImportError:
-            # speak English if there is a problem with import of wx
-            def noop_traslate(string):
-                return string
-            _.translate = noop_traslate
-    return _.translate(string)
-
-# attribute translate of function _
-_.translate = None
-
 # TODO: this should be part of some reader object
 _MESSAGES = []
 

gui/wxpython/core/units.py

@@ -28,7 +28,6 @@ if __name__ == '__main__':
     import os
     import sys
 
-from core.utils import _
 
 
 class BaseUnits:

gui/wxpython/core/utils.py

@@ -28,7 +28,7 @@ from grass.exceptions import OpenError
 
 from core.gcmd import RunCommand
 from core.debug import Debug
-from core.globalvar import ETCDIR, wxPythonPhoenix, _
+from core.globalvar import ETCDIR, wxPythonPhoenix
 
 def cmp(a, b):
     """cmp function"""

gui/wxpython/core/workspace.py

@@ -25,7 +25,7 @@ try:
 except ImportError:
     from io import StringIO
 
-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

@@ -31,7 +31,6 @@ from grass.exceptions import CalledModuleError
 from core import utils
 from core.debug import Debug
 from core.gthread import gThread
-from core.utils import _
 
 try:
     haveGdal = True

gui/wxpython/datacatalog/catalog.py

@@ -20,7 +20,6 @@ import wx
 from core.gthread import gThread
 from core.debug import Debug
 from datacatalog.tree import DataCatalogTree
-from core.utils import _
 from datacatalog.toolbars import DataCatalogToolbar
 
 from grass.pydispatch.signal import Signal

gui/wxpython/datacatalog/frame.py

@@ -21,7 +21,6 @@ import sys
 
 import wx
 
-from core.utils import _
 from core.globalvar import ICONDIR
 from core.gcmd import RunCommand, GMessage
 from datacatalog.tree import DataCatalogTree

gui/wxpython/datacatalog/toolbars.py

@@ -18,7 +18,6 @@ import wx
 from gui_core.toolbars import BaseToolbar
 from gui_core.wrap import StaticText, TextCtrl
 from icons.icon import MetaIcon
-from core.utils import _
 
 icons = {
     'reloadTree': MetaIcon(

gui/wxpython/dbmgr/base.py

@@ -56,7 +56,7 @@ from grass.script.utils import decode
 
 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
@@ -654,7 +654,7 @@ class VirtualAttributeList(ListCtrl,
         # redraw the list
         self.Refresh()
         wx.EndBusyCursor()
-        
+
     def Sorter(self, key1, key2):
         colName = self.GetColumn(self._col).GetText()
         ascending = self._colSortFlag[self._col]

gui/wxpython/dbmgr/dialogs.py

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

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

@@ -39,7 +39,6 @@ def main():
     from grass.script.setup import set_gui_path
     set_gui_path()
 
-    from core.utils import _
     from dbmgr.manager import AttributeManager
 
     mapName = gscript.find_file(options['map'], element='vector')['fullname']

gui/wxpython/dbmgr/manager.py

@@ -40,7 +40,6 @@ import grass.script as grass
 
 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
 from gui_core.wrap import Button

gui/wxpython/dbmgr/sqlbuilder.py

@@ -31,7 +31,6 @@ import sys
 import six
 
 from core import globalvar
-from core.utils import _
 import wx
 
 from grass.pydispatch.signal import Signal

gui/wxpython/dbmgr/vinfo.py

@@ -25,7 +25,6 @@ from gui_core.gselect import VectorDBInfo as VectorDBInfoBase
 from gui_core.wrap import StaticText
 from core.gcmd import RunCommand, GError
 from core.settings import UserSettings
-from core.utils import _
 import grass.script as grass
 
 if sys.version_info.major >= 3:

gui/wxpython/gcp/manager.py

@@ -52,7 +52,6 @@ import grass.script as grass
 
 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, EncodeString

gui/wxpython/gcp/mapdisplay.py

@@ -27,7 +27,6 @@ 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 gui_core.wrap import Menu

gui/wxpython/gcp/statusbar.py

@@ -20,7 +20,6 @@ This program is free software under the GNU General Public License
 import wx
 
 from core.gcmd import GMessage
-from core.utils import _
 from mapdisp.statusbar import SbItem, SbTextItem
 from gui_core.wrap import SpinCtrl
 

gui/wxpython/gcp/toolbars.py

@@ -21,7 +21,6 @@ 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/gis_set.py

@@ -27,13 +27,14 @@ import platform
 import codecs
 import getpass
 
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
+from grass.script import core as grass
+
 from core import globalvar
-from core.utils import _
 import wx
 import wx.lib.mixins.listctrl as listmix
 
-from grass.script import core as grass
-
 from core.gcmd import GMessage, GError, DecodeString, RunCommand
 from core.utils import GetListOfLocations, GetListOfMapsets
 from startup.utils import (

gui/wxpython/gis_set_error.py

@@ -14,6 +14,12 @@ This program is free software under the GNU General Public License
 import os
 import sys
 
+# i18n is taken care of in the grass library code.
+# So we need to import it before any of the GUI code.
+# NOTE: in this particular case, we don't really need the grass library;
+# NOTE: we import it just for the side effects of gettext.install()
+import grass
+
 from core import globalvar
 import wx
 

gui/wxpython/gmodeler/dialogs.py

@@ -32,7 +32,6 @@ 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

@@ -42,7 +42,6 @@ else:
     import wx.lib.flatnotebook as FN
 from wx.lib.newevent import NewEvent
     
-from core.utils import _
 from gui_core.widgets import GNotebook
 from core.gconsole        import GConsole, \
     EVT_CMD_RUN, EVT_CMD_DONE, EVT_CMD_PREPARE

gui/wxpython/gmodeler/model.py

@@ -46,7 +46,6 @@ 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,7 +21,6 @@ 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 _
 from gui_core.wrap import SpinCtrl, Button, StaticText, \
     StaticBox, TextCtrl
 

gui/wxpython/gmodeler/toolbars.py

@@ -20,7 +20,6 @@ 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

@@ -50,7 +50,6 @@ from core.gcmd import GError, RunCommand, GMessage
 from gui_core.gselect import LocationSelect, MapsetSelect, Select, \
     OgrTypeSelect, SubGroupSelect
 from gui_core.widgets import SingleSymbolPanel, GListCtrl, SimpleValidator, MapValidator
-from core.utils import _
 from core.settings import UserSettings
 from core.debug import Debug
 from gui_core.wrap import SpinCtrl, TextCtrl, Button, CheckListBox, \

gui/wxpython/gui_core/forms.py

@@ -101,7 +101,6 @@ 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
 from core.giface import Notification

gui/wxpython/gui_core/ghelp.py

@@ -45,7 +45,6 @@ if __name__ == '__main__':
     set_gui_path()
 
 from core import globalvar
-from core.utils import _
 from core.gcmd import GError, DecodeString
 from gui_core.widgets import FormNotebook, ScrolledPanel
 from gui_core.wrap import Button, StaticText, TextCtrl

gui/wxpython/gui_core/goutput.py

@@ -40,7 +40,6 @@ from gui_core.prompt import GPromptSTC
 from gui_core.wrap import Button, ToggleButton, StaticText, \
     StaticBox
 from core.settings import UserSettings
-from core.utils import _
 from gui_core.widgets import SearchModuleWidget
 
 

gui/wxpython/gui_core/gselect.py

@@ -74,7 +74,7 @@ from core.gcmd import RunCommand, GError, GMessage, GWarning, GException
 from core.utils    import GetListOfLocations, GetListOfMapsets, \
     GetFormats, rasterFormatExtension, vectorFormatExtension
 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
 from gui_core.vselect import VectorSelectBase

gui/wxpython/gui_core/mapdisp.py

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

gui/wxpython/gui_core/menu.py

@@ -24,7 +24,6 @@ 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
 from gui_core.wrap import Button, StaticText

gui/wxpython/gui_core/preferences.py

@@ -45,7 +45,7 @@ from grass.exceptions import OpenError
 
 from core import globalvar
 from core.gcmd import RunCommand, GError
-from core.utils import ListOfMapsets, GetColorTables, ReadEpsgCodes, _
+from core.utils import ListOfMapsets, GetColorTables, ReadEpsgCodes
 from core.settings import UserSettings
 from core.globalvar import wxPythonPhoenix
 from gui_core.dialogs import SymbolDialog, DefaultFontDialog

gui/wxpython/gui_core/prompt.py

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

gui/wxpython/gui_core/pyedit.py

@@ -29,7 +29,6 @@ if __name__ == '__main__':
     from grass.script.setup import set_gui_path
     set_gui_path()
 
-from core.utils import _
 from core.gcmd import EncodeString, GError
 from gui_core.pystc import PyStc
 from core import globalvar

gui/wxpython/gui_core/pystc.py

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

gui/wxpython/gui_core/query.py

@@ -17,7 +17,6 @@ import os
 import wx
 import six
 
-from core.utils import _
 from core.gcmd import DecodeString
 from gui_core.treeview import TreeListView
 from gui_core.wrap import Button, StaticText, Menu

gui/wxpython/gui_core/simplelmgr.py

@@ -35,7 +35,6 @@ from gui_core.wrap import CheckListBox, Menu
 from core.utils import GetLayerNameFromCmd
 from core.gcmd import GError
 from core.layerlist import LayerList
-from core.utils import _
 
 SIMPLE_LMGR_RASTER = 1
 SIMPLE_LMGR_VECTOR = 2

gui/wxpython/gui_core/toolbars.py

@@ -23,7 +23,6 @@ import wx
 
 from core import globalvar
 from core.debug import Debug
-from core.utils import _
 from icons.icon import MetaIcon
 from collections import defaultdict
 from core.globalvar import IMGDIR

gui/wxpython/gui_core/treeview.py

@@ -39,7 +39,6 @@ if __name__ == '__main__':
     set_gui_path()
 
 from core.treemodel import TreeModel, DictNode
-from core.utils import _
 from gui_core.wrap import CustomTreeCtrl
 
 from grass.pydispatch.signal import Signal

gui/wxpython/gui_core/vselect.py

@@ -25,7 +25,6 @@ import random
 import wx
 import wx.lib.mixins.listctrl as listmix
 
-from core.utils import _
 from core.gcmd import GMessage, GError, GWarning
 from core.gcmd import RunCommand
 from gui_core.wrap import Button

gui/wxpython/gui_core/widgets.py

@@ -87,7 +87,6 @@ from grass.script import core as grass
 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
 from gui_core.wrap import Button, SearchCtrl, StaticText, StaticBox, \

gui/wxpython/iclass/dialogs.py

@@ -26,7 +26,6 @@ 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 GError, RunCommand, GMessage
 from gui_core.dialogs import SimpleDialog, GroupDialog

gui/wxpython/iclass/digit.py

@@ -22,7 +22,6 @@ 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

@@ -23,7 +23,6 @@ import six
 import copy
 import tempfile
 import types
-from core.utils import _
 
 from core import globalvar
 import wx

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

@@ -65,7 +65,6 @@ def 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
 
     group_name = subgroup_name = map_name = trainingmap_name = None

gui/wxpython/iclass/plots.py

@@ -19,7 +19,6 @@ import wx
 
 import gui_core.wxlibplot as plot
 import wx.lib.scrolledpanel as scrolled
-from core.utils import _
 from core.gcmd import GError
 
 

gui/wxpython/iclass/statistics.py

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

gui/wxpython/iclass/toolbars.py

@@ -22,7 +22,6 @@ from __future__ import print_function
 
 import wx
 
-from core.utils import _
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from icons.icon import MetaIcon
 from iclass.dialogs import IClassMapDialog, ContrastColor

gui/wxpython/icons/icon.py

@@ -23,7 +23,6 @@ import six
 import wx
 
 from core.settings import UserSettings
-from core.utils import _
 
 # default icon set
 from .grass_icons import iconSet as g_iconSet

gui/wxpython/image2target/ii2t_gis_set.py

@@ -29,7 +29,6 @@ import codecs
 import getpass
 
 from core import globalvar
-from core.utils import _
 import wx
 import wx.lib.mixins.listctrl as listmix
 

gui/wxpython/image2target/ii2t_manager.py

@@ -55,7 +55,6 @@ import grass.script as grass
 
 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, EncodeString

gui/wxpython/image2target/ii2t_mapdisplay.py

@@ -27,7 +27,6 @@ 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 gui_core.wrap import Menu

gui/wxpython/image2target/ii2t_statusbar.py

@@ -20,7 +20,6 @@ This program is free software under the GNU General Public License
 import wx
 
 from core.gcmd import GMessage
-from core.utils import _
 from mapdisp.statusbar import SbItem, SbTextItem
 from gui_core.wrap import SpinCtrl
 

gui/wxpython/image2target/ii2t_toolbars.py

@@ -21,7 +21,6 @@ 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/lmgr/frame.py

@@ -46,7 +46,7 @@ from grass.script.utils import decode
 
 from core.gcmd import RunCommand, GError, GMessage, EncodeString
 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

@@ -38,7 +38,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,7 +21,6 @@ from core.menutree import MenuTreeModelBuilder
 from core.toolboxes import getMenudataFile, getMessages, clearMessages
 from core.globalvar import WXGUIDIR
 from core.gcmd import GError
-from core.utils import _
 
 
 class LayerManagerMenuData(MenuTreeModelBuilder):

gui/wxpython/lmgr/pyshell.py

@@ -29,7 +29,6 @@ from wx.py.version import VERSION
 import grass.script as grass
 from grass.script.utils import try_remove
 
-from core.utils import _
 from gui_core.wrap import Button
 
 

gui/wxpython/lmgr/toolbars.py

@@ -25,7 +25,6 @@ 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):

gui/wxpython/location_wizard/dialogs.py

@@ -24,7 +24,6 @@ import wx.lib.scrolledpanel as scrolled
 
 from core import globalvar
 from core.gcmd import RunCommand
-from core.utils import _
 from location_wizard.base import BaseClass
 from gui_core.wrap import Button, StaticText, StaticBox, \
     TextCtrl

gui/wxpython/location_wizard/wizard.py

@@ -51,7 +51,6 @@ else:
 import wx.lib.scrolledpanel as scrolled
 
 from core import utils
-from core.utils import _
 from core.utils import cmp
 from core.gcmd import RunCommand, GError, GMessage, GWarning
 from gui_core.widgets import GenericValidator

gui/wxpython/mapdisp/frame.py

@@ -33,7 +33,7 @@ import wx.aui
 from mapdisp.toolbars import MapToolbar, NvizIcons
 from mapdisp.gprint import PrintOptions
 from core.gcmd import GError, GMessage, RunCommand
-from core.utils import ListOfCatsToRange, GetLayerNameFromCmd, _
+from core.utils import ListOfCatsToRange, GetLayerNameFromCmd
 from gui_core.dialogs import GetImageHandlers, ImageSizeDialog
 from core.debug import Debug
 from core.settings import UserSettings

gui/wxpython/mapdisp/gprint.py

@@ -19,7 +19,6 @@ 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):

gui/wxpython/mapdisp/main.py

@@ -45,7 +45,6 @@ from core import utils
 from core.giface import StandaloneGrassInterface
 from core.gcmd import RunCommand
 from core.render import Map, MapLayer, Overlay, RenderMapMgr
-from core.utils import _
 from mapdisp.frame import MapFrame
 from core.debug import Debug
 from core.settings import UserSettings

gui/wxpython/mapdisp/statusbar.py

@@ -37,7 +37,6 @@ import wx
 from core import utils
 from core.gcmd import GMessage, RunCommand
 from core.settings import UserSettings
-from core.utils import _
 from gui_core.wrap import StaticText, TextCtrl
 
 from grass.script import core as grass

gui/wxpython/mapdisp/test_mapdisp.py

@@ -58,7 +58,6 @@ import grass.script as grass
 from grass.script.setup import set_gui_path
 set_gui_path()
 
-from core.utils import _
 from core.settings import UserSettings
 from core.globalvar import CheckWxVersion
 from core.giface import StandaloneGrassInterface

gui/wxpython/mapdisp/toolbars.py

@@ -22,7 +22,6 @@ 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

@@ -20,7 +20,6 @@ import wx.lib.scrolledpanel as SP
 import wx.lib.colourselect as csel
 
 from core import globalvar
-from core.utils import _
 from gui_core import gselect
 from gui_core.widgets import SimpleValidator
 from gui_core.preferences import PreferencesBaseDialog

gui/wxpython/mapswipe/frame.py

@@ -29,7 +29,6 @@ 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 core.layerlist import LayerListToRendererConverter
 from gui_core.query import QueryDialog, PrepareQueryResults
 

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

@@ -59,7 +59,6 @@ def 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
 
     driver = UserSettings.Get(group='display', key='driver', subkey='type')

gui/wxpython/mapswipe/mapwindow.py

@@ -20,7 +20,6 @@ This program is free software under the GNU General Public License
 import wx
 
 from core.debug import Debug
-from core.utils import _
 from core.settings import UserSettings
 from mapwin.buffered import BufferedMapWindow
 from gui_core.wrap import Rect

gui/wxpython/mapswipe/toolbars.py

@@ -21,7 +21,6 @@ import wx
 from gui_core.toolbars import BaseToolbar, BaseIcons
 from gui_core.wrap import Menu
 from icons.icon import MetaIcon
-from core.utils import _
 
 
 swipeIcons = {

gui/wxpython/mapwin/analysis.py

@@ -21,7 +21,6 @@ import os
 import math
 import wx
 
-from core.utils import _
 import core.units as units
 from core.gcmd import RunCommand
 from core.giface import Notification

gui/wxpython/mapwin/base.py

@@ -24,7 +24,6 @@ import six
 
 from core.settings import UserSettings
 from core.gcmd import GError
-from core.utils import _
 from gui_core.wrap import StockCursor
 
 from grass.script import core as grass

gui/wxpython/mapwin/buffered.py

@@ -43,7 +43,7 @@ from core.gcmd import RunCommand, GException, GError, GMessage
 from core.debug import Debug
 from core.settings import UserSettings
 from mapwin.base import MapWindowBase
-from core.utils import GetGEventAttribsForHandler, _
+from core.utils import GetGEventAttribsForHandler
 import core.utils as utils
 from mapwin.graphics import GraphicsSet
 from core.gthread import gThread

gui/wxpython/mapwin/decorations.py

@@ -19,7 +19,6 @@ This program is free software under the GNU General Public License
 """
 
 import os
-from core.utils import _
 
 import wx
 

gui/wxpython/mapwin/graphics.py

@@ -20,7 +20,6 @@ from copy import copy
 
 import wx
 
-from core.utils import _
 
 
 class GraphicsSet: