Changeset 50514

Timestamp:

Jan 28, 2012, 2:07:06 AM (13 years ago)

Author:

martinl

Message:

wxGUI: fix gettext warning

Location:

grass/branches/develbranch_6/gui/wxpython

Files:

• gmodeler/model.py (modified) (2 diffs)
• gui_core/goutput.py (modified) (2 diffs)
• modules/colorrules.py (modified) (2 diffs)
• psmap/dialogs.py (modified) (2 diffs)
• wxplot/base.py (modified) (1 diff)

grass/branches/develbranch_6/gui/wxpython/gmodeler/model.py

@@ -386 +386 @@
                                 break
                         if report:
-                            errList.append(_("%s: undefined variable '%s'") % (cmd[0], var))
+                            errList.append(cmd[0] + ": " + _("undefined variable '%s'") % var)
             ### TODO: check variables in file only optionally
             ### errList += self._substituteFile(action, checkOnly = True)
@@ -448 +448 @@
                 var = sval.group(2).strip()[1:] # ignore '%'
                 cmd = item.GetLog(string = False)[0]
-                errList.append(_("%s: undefined variable '%s'") % (cmd, var))
+                errList.append(cmd + ": " + _("undefined variable '%s'") % var)
             
             if not checkOnly:

grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py

@@ -760 +760 @@
         if self.parent.GetName() == 'Modeler':
             self.parent.OnCmdDone(event)
+            
+        # Process results here
+        try:
+            ctime = time.time() - event.time
+            if ctime < 60:
+                stime = _("%d sec") % int(ctime)
+            else:
+                mtime = int(ctime / 60)
+                stime = _("%(min)d min %(sec)d sec") %  { 'min' : mtime, 
+                                                          'sec' : int(ctime - (mtime * 60)) }
+        except KeyError:
+            # stopped deamon
+            stime = _("unknown")
         
         if event.aborted:
@@ -765 +778 @@
             self.WriteLog(_('Please note that the data are left in inconsistent state '
                             'and may be corrupted'), self.cmdOutput.StyleWarning)
-            self.WriteCmdLog('(%s) %s (%d sec)' % (str(time.ctime()),
-                                                   _('Command aborted'),
-                                                   (time.time() - event.time)))
-            # pid=self.cmdThread.requestId)
-            self.btnCmdAbort.Enable(False)
-        else:
-            try:
-                # Process results here
-                ctime = time.time() - event.time
-                if ctime < 60:
-                    stime = _("%d sec") % int(ctime)
-                else:
-                    mtime = int(ctime / 60)
-                    stime = _("%d min %d sec") % (mtime, 
-                                                  int(ctime - (mtime * 60)))
-                
-                self.WriteCmdLog('(%s) %s (%s)' % (str(time.ctime()),
-                                                   _('Command finished'),
-                                                   (stime)))
-            except KeyError:
-                # stopped deamon
-                pass
-
-            self.btnCmdAbort.Enable(False)
+            msg = _('Command aborted')
+        else:
+            msg = _('Command finished')
+            
+        self.WriteCmdLog('(%s) %s (%s)' % (str(time.ctime()), msg, stime))
+        self.btnCmdAbort.Enable(False)
         
         if event.onDone:

grass/branches/develbranch_6/gui/wxpython/modules/colorrules.py

@@ -1169 +1169 @@
             # currently v.colors need the map to be in current mapset
             if self.version7 and self.attributeType == 'color':
-                message = _("Selected map <%s> is not in current mapset <%s>. "
+                message = _("Selected map <%(map)s> is not in current mapset <%(mapset)s>. "
                             "Color rules cannot be edited.") % \
-                            (self.inmap, grass.gisenv()['MAPSET'])
+                            { 'map' : self.inmap,
+                              'mapset' : grass.gisenv()['MAPSET'] }
             else:
-                message = _("Selected map <%s> is not in current mapset <%s>. "
+                message = _("Selected map <%(map)s> is not in current mapset <%(mapset)s>. "
                             "Attribute table cannot be edited.") % \
-                            (self.inmap, grass.gisenv()['MAPSET'])
+                            { 'map' : self.inmap,
+                              'mapset' : grass.gisenv()['MAPSET'] }
             wx.CallAfter(GMessage, parent = self, message = message)
             self.DisableClearAll()
@@ -1446 +1448 @@
         if self.properties['min'] or self.properties['max']:
             if ctype == float:
-                range = _("(range: %.1f to %.1f)") % (self.properties['min'], self.properties['max'])
+                range = "%s: %.1f - %.1f)" % (_("range"),
+                                              self.properties['min'], self.properties['max'])
             elif ctype == int:
-                range = _("(range: %d to %d)") % (self.properties['min'], self.properties['max'])
+                range = "%s: %d - %d)" % (_("range"),
+                                          self.properties['min'], self.properties['max'])
         if range:
             if self.colorTable:

grass/branches/develbranch_6/gui/wxpython/psmap/dialogs.py

@@ -1107 +1107 @@
                 return False
         if not os.path.exists(instr['epsfile']):
-            GError(_("Failed to read instruction %s: file %s not found.") % instruction, instr['epsfile'])
+            GError(_("Failed to read instruction %(inst)s: "
+                     "file %(file)s not found.") % { 'inst' : instruction,
+                                                     'file' : instr['epsfile'] })
             return False
         
@@ -6014 +6016 @@
     def SetSizeInfoLabel(self, image):
         """!Update image size label"""
-        self.imagePanel.image['sizeInfo'].SetLabel(_("size: %s x %s pts") % (image.GetWidth(), image.GetHeight()))
+        self.imagePanel.image['sizeInfo'].SetLabel(_("size: %(width)s x %(height)s pts") % \
+                                                       { 'width'  : image.GetWidth(),
+                                                         'height' : image.GetHeight() })
         self.imagePanel.image['sizeInfo'].GetContainingSizer().Layout()
         

grass/branches/develbranch_6/gui/wxpython/wxplot/base.py

@@ -397 +397 @@
 
     def OnMouseLeftDown(self,event):
-        self.SetStatusText(_("Left Mouse Down at Point: (%.4f, %.4f)") % \
-                               self.client._getXY(event))
+        self.SetStatusText(_("Left Mouse Down at Point:") + \
+                               " (%.4f, %.4f)" % self.client._getXY(event))
         event.Skip() # allows plotCanvas OnMouseLeftDown to be called