[GRASS-SVN] r40461 - in grass/branches/releasebranch_6_4/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-01-15 17:56:23 -0500 (Fri, 15 Jan 2010)
New Revision: 40461

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
Log:
reverted button labels, wx.Locale() is needed instead

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py	2010-01-15 22:54:49 UTC (rev 40460)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py	2010-01-15 22:56:23 UTC (rev 40461)
@@ -124,11 +124,9 @@
         self.bstart = wx.Button(parent=self.panel, id=wx.ID_ANY,
                                 label=_("Start GRASS"))
         self.bstart.SetDefault()
-        self.bexit = wx.Button(parent=self.panel, id=wx.ID_EXIT,
-                                label=_("Quit"))
+        self.bexit = wx.Button(parent=self.panel, id=wx.ID_EXIT)
         self.bstart.SetMinSize((180, self.bexit.GetSize()[1]))
-        self.bhelp = wx.Button(parent=self.panel, id=wx.ID_HELP,
-                                label=_("Help"))
+        self.bhelp = wx.Button(parent=self.panel, id=wx.ID_HELP)
         self.bbrowse = wx.Button(parent=self.panel, id=wx.ID_ANY,
                                  label=_("Browse"))
         self.bmapset = wx.Button(parent=self.panel, id=wx.ID_ANY,

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2010-01-15 22:54:49 UTC (rev 40460)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2010-01-15 22:56:23 UTC (rev 40461)
@@ -723,10 +723,6 @@
         except ValueError:
             pass
 
-        # i18N
-        import gettext
-        gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
-
         wx.Frame.__init__(self, parent=parent, id=ID, title=title,
                           pos=wx.DefaultPosition, style=wx.DEFAULT_FRAME_STYLE | wx.TAB_TRAVERSAL)
 
@@ -798,16 +794,16 @@
         # buttons
         btnsizer = wx.BoxSizer(orient=wx.HORIZONTAL)
         # cancel
-        self.btn_cancel = wx.Button(parent=self.panel, id=wx.ID_CLOSE, label=_("&Close"))
+        self.btn_cancel = wx.Button(parent=self.panel, id=wx.ID_CLOSE)
         self.btn_cancel.SetToolTipString(_("Close this window without executing the command"))
         btnsizer.Add(item=self.btn_cancel, proportion=0, flag=wx.ALL | wx.ALIGN_CENTER, border=10)
         self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnCancel)
         # help
-        self.btn_help = wx.Button(parent=self.panel, id=wx.ID_HELP, label=_("&Help"))
+        self.btn_help = wx.Button(parent=self.panel, id=wx.ID_HELP)
         self.btn_help.SetToolTipString(_("Show manual page of the command"))
         self.btn_help.Bind(wx.EVT_BUTTON, self.OnHelp)
         if self.get_dcmd is not None: # A callback has been set up
-            btn_apply = wx.Button(parent=self.panel, id=wx.ID_APPLY, label=_("&Apply"))
+            btn_apply = wx.Button(parent=self.panel, id=wx.ID_APPLY)
             btn_ok = wx.Button(parent=self.panel, id=wx.ID_OK)
             btn_ok.SetDefault()
 
@@ -826,11 +822,11 @@
             self.btn_run.SetToolTipString(_("Run the command"))
             self.btn_run.SetDefault()
             # abort
-            self.btn_abort = wx.Button(parent=self.panel, id=wx.ID_STOP, label=_("&Stop"))
+            self.btn_abort = wx.Button(parent=self.panel, id=wx.ID_STOP)
             self.btn_abort.SetToolTipString(_("Abort the running command"))
             self.btn_abort.Enable(False)
             # copy
-            self.btn_clipboard = wx.Button(parent=self.panel, id=wx.ID_COPY, label=_("C&opy"))
+            self.btn_clipboard = wx.Button(parent=self.panel, id=wx.ID_COPY)
             self.btn_clipboard.SetToolTipString(_("Copy the current command string to the clipboard"))
 
             btnsizer.Add(item=self.btn_abort, proportion=0,