Changeset 3335

Timestamp:

08/26/07 06:51:02 (1 year ago)

Author:

ed

Message:

Running pygettext turned up lots of malformed localized strings. I've corrected them all here.

Files:

• trunk/dabo/db/dCursorMixin.py (modified) (1 diff)
• trunk/dabo/lib/datanav/Form.py (modified) (2 diffs)
• trunk/dabo/lib/datanav/Page.py (modified) (2 diffs)
• trunk/dabo/lib/datanav2/Form.py (modified) (2 diffs)
• trunk/dabo/lib/datanav2/Page.py (modified) (1 diff)
• trunk/dabo/ui/__init__.py (modified) (9 diffs)
• trunk/dabo/ui/uiwx/dEditor.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dForm.py (modified) (3 diffs)
• trunk/dabo/ui/uiwx/dToggleButton.py (modified) (1 diff)

trunk/dabo/db/dCursorMixin.py

@@ -1497 +1497 @@
-            raise dException.FieldNotFoundException, _("No field specified for seek()")
-        if not self._records[0].has_key(fld) and not self.VirtualFields.has_key(fld):
- % fld)
+) % fld
-
-        # Copy the specified field vals and their row numbers to a list, and

trunk/dabo/lib/datanav/Form.py

@@ -206 +206 @@
-            for index in range(2, self.pageFrame.PageCount):
-                if index == 2:
-_(self.pageFrame.Pages[index].Caption)
+self.pageFrame.Pages[index].Caption
-                    onHit = self.onEditCurrentRecord
-                    tag = self.pageFrame.Pages[index].DataSource
-                    help = _("Edit the fields of the currently selected record.")
-                else:
-_(self.pageFrame.Pages[index].Caption)
+self.pageFrame.Pages[index].Caption
-                    onHit = onActivatePage
-                    tag = self.pageFrame.Pages[index]
@@ -354 +354 @@
-        biz = self.getBizobj(ds)
-        if biz:
-_(biz.Caption)
+biz.Caption
-        else:
-            title = _("Edit")

trunk/dabo/lib/datanav/Page.py

@@ -218 +218 @@
-    def _orderByClause(self, infoOnly=False):
-        sf = self.sortFields
-
-
+
+
+
+
-
-        flds = [(self.sortFields[k][0], k, " ".join(parts(k)))
@@ -736 +738 @@
-                    childBiz = self.Form.getBizobj(child)
-                    grdLabel = self.addObject(dabo.ui.dLabel, "lblChild" + child)
-_(self.Form.getBizobj(child).Caption)
+self.Form.getBizobj(child).Caption
-                    grdLabel.FontSize = 14
-                    grdLabel.FontBold = True

trunk/dabo/lib/datanav2/Form.py

@@ -125 +125 @@
-            for index in range(2, self.pageFrame.PageCount):
-                if index == 2:
-_(self.pageFrame.Pages[index].Caption)
+self.pageFrame.Pages[index].Caption
-                    onHit = self.onEditCurrentRecord
-                    tag = self.pageFrame.Pages[index].DataSource
-                    help = _("Edit the fields of the currently selected record.")
-                else:
-_(self.pageFrame.Pages[index].Caption)
+self.pageFrame.Pages[index].Caption
-                    onHit = onActivatePage
-                    tag = self.pageFrame.Pages[index]
@@ -273 +273 @@
-        biz = self.getBizobj()
-        if biz:
-_(biz.Caption)
+biz.Caption
-        else:
-            caption = _("Edit")

trunk/dabo/lib/datanav2/Page.py

@@ -214 +214 @@
-    def _orderByClause(self, infoOnly=False):
-        sf = self.sortFields
-
-
+
+
+
+
-
-        flds = [(self.sortFields[k][0], k, " ".join(parts(k)))

trunk/dabo/ui/__init__.py

@@ -10 +10 @@
-
-    import dabo.ui
-'wx'
+"wx"
-    
-"""
-
+
+
+
-import dabo
-from dabo.dLocalize import _
@@ -19 +21 @@
-
-def getUIType():
-
-
+
-    try:
-'shortName'
+"shortName"
-    except (AttributeError, NameError, KeyError):
-        return None
@@ -28 +29 @@
-        
-def loadUI(uiType):
-
-
+
-    retVal = False
-    currType = getUIType()
@@ -49 +49 @@
-            #dabo.errorLog.write("Error Loading UI: %s" % e)
-            traceback.print_exc()
-                
-    else:
-        if currType == typ:
@@ -55 +54 @@
-            pass
-        else:
-
-
-
+
+
-    return retVal
-
@@ -68 +66 @@
-# app, you should instead set the UI property of the dApp object.
-try:
-'DABO_DEFAULT_UI'
+"DABO_DEFAULT_UI"
-except KeyError:
-    __defaultUI = None
-
-if __defaultUI:
- % __defaultUI)
+) % __defaultUI
-    # For now, don't do the tempting option:
-    #loadUI(defaultUI)
@@ -79 +77 @@
-    # for single-file installers, it needs to see the import statement.
-    # Therefore, do it explicitly:
-'wx', 'wxPython', 'uiwx'
+"wx", "wxPython", "uiwx"
-        from uiwx import *
-    
-else:
-    pass
@@ -106 +103 @@
-    DynamicCaption = makeDynamicProperty(Caption)
-    """
-    import inspect
-
-    propName = None
-    frame = inspect.currentframe(1)
@@ -135 +130 @@
-%s property. If Dynamic%s is set to None (the default), %s 
-will not be dynamically evaluated.
- % (propName, propName, propName, propName)
+) % (propName, propName, propName, propName
-
-    if additionalDoc:

trunk/dabo/ui/uiwx/dEditor.py

@@ -1924 +1924 @@
-                    self._language = val.lower()
-                else:
- % ", ".join(LexerDic.keys()
+) % ", ".join(LexerDic.keys(
-                self.setDefaults()
-                self._defaultsSet = True

trunk/dabo/ui/uiwx/dForm.py

@@ -359 +359 @@
-        except dException.BusinessRuleViolation, e:
-            self.setStatusText(_("Save failed."))
-_( str(e) 
+str(e
-            self.notifyUser(msg, severe=True, exception=e)
-            return False
@@ -574 +574 @@
-            bizobj.new()
-        except dException.dException, e:
- % str(e)
+) % str(e
-                    severe=True, exception=e)
-
@@ -710 +710 @@
-                else:
-                    rowNumber = 1
- % (rowNumber, rowCount)
+) % (rowNumber, rowCount
-
-

trunk/dabo/ui/uiwx/dToggleButton.py

@@ -117 +117 @@
-        else:
-            state = ("up", "False")
- % state)
+) % state
-
-