[GRASS-SVN] r41828 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-12 14:06:36 -0400 (Mon, 12 Apr 2010)
New Revision: 41828

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
Log:
avoid gettext warnings
(merge r41827 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2010-04-12 18:03:07 UTC (rev 41827)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2010-04-12 18:06:36 UTC (rev 41828)
@@ -389,11 +389,11 @@
                 if self._module and '=' not in cmd[-1]:
                     message = ''
                     if cmd[-1][0] == '-': # flag
-                        message = _("Warning: flag <%s> not found in '%s'") % \
-                            (cmd[-1][1:], self._module.name)
+                        message = _("Warning: flag <%(flag)s> not found in '%(module)s'") % \
+                            { 'flag' : cmd[-1][1:], 'module' : self._module.name }
                     else: # option
-                        message = _("Warning: option <%s> not found in '%s'") % \
-                            (cmd[-1], self._module.name)
+                        message = _("Warning: option <%(param)s> not found in '%(module)s'") % \
+                            { 'param' : cmd[-1], 'module' : self._module.name }
                     self.statusbar.SetStatusText(message)
         
         if self._module and len(cmd[-1]) == 2 and cmd[-1][-2] == '=':

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2010-04-12 18:03:07 UTC (rev 41827)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2010-04-12 18:06:36 UTC (rev 41828)
@@ -460,8 +460,8 @@
         try:
             windfile = open (filename, "r")
         except IOError, e:
-            sys.exit(_("Error: Unable to open '%s'. Reason: %s. wxGUI exited.\n") % \
-                         filename, e)
+            sys.exit(_("Error: Unable to open '%(file)s'. Reason: %(ret)s. wxGUI exited.\n") % \
+                         { 'file' : filename, 'ret' : e})
         
         for line in windfile.readlines():
             line = line.strip()