[GRASS-SVN] r46186 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-05-04 10:07:33 -0700 (Wed, 04 May 2011)
New Revision: 46186

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/render.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py
Log:
wxGUI: avoid gettext warning
      (merge r46183 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2011-05-04 16:48:08 UTC (rev 46185)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2011-05-04 17:07:33 UTC (rev 46186)
@@ -680,8 +680,9 @@
             
             if errLines:
                 gcmd.GError(parent = self,
-                            message = _("Error when reading file '%s'.\n\nLines: %s") % \
-                                (translatorsfile, os.linesep.join(map (utils.UnicodeString, errLines))))
+                            message = _("Error when reading file '%s'.") % translatorsfile + \
+                                "\n\n" + _("Lines:") + " %s" % \
+                                os.linesep.join(map(utils.UnicodeString, errLines)))
         else:
             contribs = None
         
@@ -735,8 +736,9 @@
             
             if errLines:
                 gcmd.GError(parent = self,
-                            message = _("Error when reading file '%s'.\n\nLines: %s") % \
-                                (translatorsfile, os.linesep.join(map (utils.UnicodeString, errLines))))
+                            message = _("Error when reading file '%s'.") % translatorsfile + \
+                                "\n\n" + _("Lines:") + " %s" % \
+                                os.linesep.join(map(utils.UnicodeString, errLines)))
         else:
             translators = None
         

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2011-05-04 16:48:08 UTC (rev 46185)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py	2011-05-04 17:07:33 UTC (rev 46186)
@@ -1980,11 +1980,11 @@
         cmdout, cmderr = grass.Popen([cmd, '--interface-description'], stdout = grass.PIPE,
                                      stderr = grass.PIPE).communicate()
     except OSError, e:
-        raise gcmd.GException, _("Unable to fetch interface description for command '%s'. "
-                                 "Details: %s") % (cmd, e)
+        raise gcmd.GException, _("Unable to fetch interface description for command '%s'.") % cmd + \
+            _("Details:") +  "%s" % e
     if cmderr and cmderr[:7] != 'WARNING':
-        raise gcmd.GException, _("Unable to fetch interface description for command '%s'. "
-                                 "Details: %s") % (cmd, cmderr)
+        raise gcmd.GException, _("Unable to fetch interface description for command '%s'.") % cmd + \
+            _("Details:") + " %s" % cmderr
     
     return cmdout.replace('grass-interface.dtd', os.path.join(globalvar.ETCDIR, 'grass-interface.dtd'))
 

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/render.py	2011-05-04 16:48:08 UTC (rev 46185)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/render.py	2011-05-04 17:07:33 UTC (rev 46186)
@@ -654,9 +654,11 @@
         
         if ret != 0:
             if rast:
-                message = _("Unable to zoom to raster map <%s>.\n\nDetails: %s") % (rast[0], msg)
+                message = _("Unable to zoom to raster map <%s>.") % rast[0] + \
+                    "\n\n" + _("Details:") + " %s" % msg
             elif vect:
-                message = _("Unable to zoom to vector map <%s>.\n\nDetails: %s") % (vect[0], msg)
+                message = _("Unable to zoom to vector map <%s>.") % vect[0] + \
+                    "\n\n" + _("Details:") + " %s" % msg
             else:
                 message = _("Unable to get current geographic extent. "
                             "Force quiting wxGUI. Please run manually g.region to "

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py	2011-05-04 16:48:08 UTC (rev 46185)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py	2011-05-04 17:07:33 UTC (rev 46186)
@@ -83,8 +83,8 @@
     def Database(self, driver, database):
         """!Opening database failed
         """
-        GError(message = _('Unable to open database <%s> by driver <%s>. '
-                           'Operation cancelled.') % (database, driver),
+        GError(message = _('Unable to open database <%(db)s> by driver <%(driver)s>. '
+                           'Operation cancelled.') % { 'db' : database, 'driver' : driver},
                parent  = self.parent,
                caption = self.caption)