dabo Commit
Revision 4950
Date: 2009-01-22 12:45:13 -0800 (Thu, 22 Jan 2009)
Author: Paul
Trac: http://trac.dabodev.com/changeset/4950
Changed:
U trunk/dabo/lib/datanav/Form.py
U trunk/dabo/lib/datanav/Grid.py
U trunk/dabo/lib/datanav/Page.py
U trunk/dabo/lib/datanav/PageFrame.py
Log:
Changed all n_() references to _(), which will fix the issue that Jacek ran
into, at least after we regenerate the .pot file.
Diff:
Modified: trunk/dabo/lib/datanav/Form.py
===================================================================
--- trunk/dabo/lib/datanav/Form.py 2009-01-22 03:58:01 UTC (rev 4949)
+++ trunk/dabo/lib/datanav/Form.py 2009-01-22 20:45:13 UTC (rev 4950)
@@ -5,7 +5,7 @@
import wx
import dabo.dEvents as dEvents
import dabo.ui
-from dabo.dLocalize import _, n_
+from dabo.dLocalize import _
import dabo.lib.reportUtils as reportUtils
import PageFrame
import Page
Modified: trunk/dabo/lib/datanav/Grid.py
===================================================================
--- trunk/dabo/lib/datanav/Grid.py 2009-01-22 03:58:01 UTC (rev 4949)
+++ trunk/dabo/lib/datanav/Grid.py 2009-01-22 20:45:13 UTC (rev 4950)
@@ -3,7 +3,7 @@
import dabo.ui
import dabo.dException as dException
dabo.ui.loadUI("wx")
-from dabo.dLocalize import _, n_
+from dabo.dLocalize import _
import dabo.dEvents as dEvents
class Grid(dabo.ui.dGrid):
Modified: trunk/dabo/lib/datanav/Page.py
===================================================================
--- trunk/dabo/lib/datanav/Page.py 2009-01-22 03:58:01 UTC (rev 4949)
+++ trunk/dabo/lib/datanav/Page.py 2009-01-22 20:45:13 UTC (rev 4950)
@@ -4,17 +4,17 @@
import dabo
import dabo.dException as dException
import dabo.dEvents as dEvents
-from dabo.dLocalize import _, n_
+from dabo.dLocalize import _
from dabo.dObject import dObject
from dabo.ui import dPanel
import Grid
-IGNORE_STRING, CHOICE_TRUE, CHOICE_FALSE = (n_("-ignore-"),
- n_("Is True"),
- n_("Is False") )
+IGNORE_STRING, CHOICE_TRUE, CHOICE_FALSE = (_("-ignore-"),
+ _("Is True"),
+ _("Is False") )
-ASC, DESC = (n_("asc"), n_("desc"))
+ASC, DESC = (_("asc"), _("desc"))
# Controls for the select page:
class SelectControlMixin(dObject):
@@ -378,27 +378,27 @@
wordSearch = bool(int(wordSearch))
if typ in ("char", "memo"):
if typ == "char":
- chcList = [n_("Equals"),
- n_("Begins With"),
- n_("Contains")]
+ chcList = [_("Equals"),
+ _("Begins With"),
+ _("Contains")]
elif typ == "memo":
- chcList = [n_("Begins With"),
- n_("Contains")]
+ chcList = [_("Begins With"),
+ _("Contains")]
if wordSearch:
- chcList.append(n_("Matches Words"))
+ chcList.append(_("Matches Words"))
chc = tuple(chcList)
elif typ in ("date", "datetime"):
- chc = (n_("Equals"),
- n_("On or Before"),
- n_("On or After"),
- n_("Before"),
- n_("After") )
+ chc = (_("Equals"),
+ _("On or Before"),
+ _("On or After"),
+ _("Before"),
+ _("After") )
elif typ in ("int", "float", "decimal"):
- chc = (n_("Equals"),
- n_("Greater than"),
- n_("Greater than/Equal to"),
- n_("Less than"),
- n_("Less than/Equal to"))
+ chc = (_("Equals"),
+ _("Greater than"),
+ _("Greater than/Equal to"),
+ _("Less than"),
+ _("Less than/Equal to"))
elif typ == "bool":
chc = (CHOICE_TRUE, CHOICE_FALSE)
else:
Modified: trunk/dabo/lib/datanav/PageFrame.py
===================================================================
--- trunk/dabo/lib/datanav/PageFrame.py 2009-01-22 03:58:01 UTC (rev 4949)
+++ trunk/dabo/lib/datanav/PageFrame.py 2009-01-22 20:45:13 UTC (rev 4950)
@@ -2,7 +2,7 @@
import dabo.ui
import dabo.dEvents as dEvents
import Page as pag
-from dabo.dLocalize import _, n_
+from dabo.dLocalize import _
class PageFrameMixin(object):
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
