[GRASS-SVN] r38365 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-07-11 05:30:52 -0400 (Sat, 11 Jul 2009)
New Revision: 38365

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
fix gettext warnings


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py	2009-07-11 09:27:37 UTC (rev 38364)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py	2009-07-11 09:30:52 UTC (rev 38365)
@@ -108,8 +108,9 @@
                                            Map=self.Map, auimgr=self.auimgr)
 
         # title
-        self.mapdisplay.SetTitle(_("GRASS GIS Map Display: %d  - Location: %s") % \
-                                     (self.disp_idx + 1, grass.gisenv()["LOCATION_NAME"]))
+        self.mapdisplay.SetTitle(_("GRASS GIS Map Display: %(id)d  - Location: %(loc)s") % \
+                                     { 'id' : self.disp_idx + 1,
+                                       'loc' : grass.gisenv()["LOCATION_NAME"] })
         
         # show new display
         if kargs['showMapDisplay'] is True:

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-07-11 09:27:37 UTC (rev 38364)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-07-11 09:30:52 UTC (rev 38365)
@@ -607,9 +607,10 @@
         try:
             gxwXml = workspace.ProcessWorkspaceFile(etree.parse(filename))
         except Exception, err:
-            raise gcmd.GStdError(_("Reading workspace file <%s> failed.\n"
+            raise gcmd.GStdError(_("Reading workspace file <%(file)s> failed.\n"
                                    "Invalid file, unable to parse XML document."
-                                   "\n\n%s") % (filename, err),
+                                   "\n\n%(err)s") % \
+                                     { 'file' : filename, 'err' : err },
                                  parent = self)
         
         busy = wx.BusyInfo(message=_("Please wait, loading workspace..."),