Quellcode durchsuchen

wxGUI: map -> view, i18n
(merge from devbr6, https://trac.osgeo.org/grass/changeset/35160)


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

Martin Landa vor 16 Jahren
Ursprung
Commit
33ddacd6d6
2 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
  1. 1 1
      gui/wxpython/gui_modules/mapdisp.py
  2. 6 6
      gui/wxpython/gui_modules/toolbars.py

+ 1 - 1
gui/wxpython/gui_modules/mapdisp.py

@@ -2887,7 +2887,7 @@ class MapFrame(wx.Frame):
             #
             self.tree.EnableItemType(type='3d-raster', enable=False)
             
-        self.toolbars['map'].combo.SetValue ("Tools")
+        self.toolbars['map'].combo.SetValue (_("2D view"))
         self.toolbars['map'].Enable2D(True)
         self.toggleStatus.Enable(True)
 

+ 6 - 6
gui/wxpython/gui_modules/toolbars.py

@@ -150,8 +150,8 @@ class MapToolbar(AbstractToolbar):
         self.InitToolbar(self.mapdisplay, self.toolbar, self.ToolbarData())
         
         # optional tools
-        self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value='2D map',
-                                 choices=['2D map', '3D map', 'Digitize'], 
+        self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value=_('2D view'),
+                                 choices=[_('2D view'), _('3D view'), _('Digitize')], 
                                  style=wx.CB_READONLY, size=(90, -1))
 
         self.comboid = self.toolbar.AddControl(self.combo)
@@ -243,17 +243,17 @@ class MapToolbar(AbstractToolbar):
         """
         Select / enable tool available in tools list
         """
-        tool =  event.GetString()
+        tool =  event.GetSelection()
         
-        if tool == "2D map":
+        if tool == 0:
             self.ExitToolbars()
             self.Enable2D(True)
 
-        elif tool == "3D map" and not self.mapdisplay.toolbars['nviz']:
+        elif tool == 1 and not self.mapdisplay.toolbars['nviz']:
             self.ExitToolbars()
             self.mapdisplay.AddToolbar("nviz")
             
-        elif tool == "Digitize" and not self.mapdisplay.toolbars['vdigit']:
+        elif tool == 2 and not self.mapdisplay.toolbars['vdigit']:
             self.ExitToolbars()
             self.mapdisplay.AddToolbar("vdigit")