[Checkins] SVN: z3c.multiform/Sandbox/src/z3c/multiform/ changed to
zope i18n, done some fixes
Bernd Dorn
bernd.dorn at fhv.at
Fri Jun 2 03:15:22 EDT 2006
Log message for revision 68453:
changed to zope i18n, done some fixes
Changed:
U z3c.multiform/Sandbox/src/z3c/multiform/actions.txt
U z3c.multiform/Sandbox/src/z3c/multiform/container/tests.py
U z3c.multiform/Sandbox/src/z3c/multiform/container/views.py
U z3c.multiform/Sandbox/src/z3c/multiform/interfaces.py
U z3c.multiform/Sandbox/src/z3c/multiform/multiform.py
U z3c.multiform/Sandbox/src/z3c/multiform/selection.py
U z3c.multiform/Sandbox/src/z3c/multiform/tests.py
-=-
Modified: z3c.multiform/Sandbox/src/z3c/multiform/actions.txt
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/actions.txt 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/actions.txt 2006-06-02 07:15:20 UTC (rev 68453)
@@ -18,6 +18,7 @@
>>> from zope.app.location.interfaces import ILocation
>>> from z3c.multiform import multiform
>>> from z3c.multiform.multiform import ItemFormBase,MultiFormBase
+ >>> from zope.app.i18n import ZopeMessageFactory as _
>>> class IOrder(interface.Interface):
... identifier = schema.Int(title=u"Identifier", readonly=True)
@@ -37,7 +38,7 @@
... form_fields = form.Fields(IOrder,omit_readonly=False,
... render_context=True)
...
- ... @multiform.parentAction(u"Save",
+ ... @multiform.parentAction(_(u"Save"),
... condition=multiform.anySubFormInputMode,inputMode=True)
... def handle_save_action(self, action, data):
... form.applyChanges(self.context, self.form_fields,
Modified: z3c.multiform/Sandbox/src/z3c/multiform/container/tests.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/container/tests.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/container/tests.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -24,12 +24,21 @@
setup.placefulSetUp()
component.provideAdapter(
+ zope.app.form.browser.DatetimeDisplayWidget,
+ [zope.schema.interfaces.IDatetime,
+ zope.publisher.interfaces.browser.IBrowserRequest,
+ ],
+ zope.app.form.interfaces.IDisplayWidget,
+ )
+
+ component.provideAdapter(
zope.app.form.browser.TextWidget,
[zope.schema.interfaces.ITextLine,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IInputWidget,
)
+
component.provideAdapter(
zope.app.form.browser.UnicodeDisplayWidget,
[zope.schema.interfaces.ITextLine,
Modified: z3c.multiform/Sandbox/src/z3c/multiform/container/views.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/container/views.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/container/views.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -1,7 +1,7 @@
import datetime
import pytz
from zope.interface.common import idatetime
-from zope.formlib.i18n import _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.formlib import form
from zope.app.dublincore.interfaces import IWriteZopeDublinCore
from zope.app.pagetemplate import ViewPageTemplateFile
@@ -111,14 +111,14 @@
form_fields['modified'].for_display=True
- @multiform.parentAction('Edit',
+ @multiform.parentAction(_('Edit'),
condition=multiform.allSubFormsDisplayMode)
def handle_edit_action(self, action, data):
#print "handle_edit_action",action,data,isSelected(self,action)
if isSelected(self,action):
self.newInputMode = True
- @multiform.parentAction("Save", inputMode=True,
+ @multiform.parentAction(_("Save"), inputMode=True,
condition=multiform.anySubFormInputMode)
def handle_save_action(self, action, data):
@@ -147,12 +147,13 @@
template = ViewPageTemplateFile('grid.pt')
- @form.action('Cancel',condition=multiform.anySubFormInputMode)
+ @form.action(_('Cancel'),condition=multiform.anySubFormInputMode)
def handle_cancel_action(self, action, data):
for form in self.subForms.values():
form.newInputMode = False
- @form.action("Paste", condition=hasClipboardContents)
+ @form.action(_("container-paste-button"),
+ condition=hasClipboardContents)
def handle_paste_action(self, action, data):
"""Paste ojects in the user clipboard to the container"""
self.form_reset = True
@@ -200,7 +201,8 @@
_("The given name(s) %s is / are already being used" %(
str(not_pasteable_ids))),)
- @form.action("Cut", condition=multiform.allSubFormsDisplayMode)
+ @form.action(_("container-cut-button"),
+ condition=multiform.allSubFormsDisplayMode)
def handle_cut_action(self, action, data):
"""move objects specified in a list of object ids"""
@@ -240,7 +242,8 @@
clipboard.clearContents()
clipboard.addItems('cut', items)
- @form.action("Copy", condition=multiform.allSubFormsDisplayMode)
+ @form.action(_("container-copy-button"),
+ condition=multiform.allSubFormsDisplayMode)
def handle_copy_action(self, action, data):
"""Copy objects specified in a list of object ids"""
@@ -281,7 +284,8 @@
clipboard.clearContents()
clipboard.addItems('copy', items)
- @form.action("Delete", condition=multiform.allSubFormsDisplayMode)
+ @form.action(_("container-delete-button"),
+ condition=multiform.allSubFormsDisplayMode)
def handle_delete_action(self, action, data):
"""Delete objects specified in a list of object ids"""
container = self.context
Modified: z3c.multiform/Sandbox/src/z3c/multiform/interfaces.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/interfaces.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/interfaces.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -1,7 +1,7 @@
from zope import schema
from zope.interface import Interface,Attribute
from zope.formlib.interfaces import IAction
-from zope.formlib.i18n import _
+from zope.app.i18n import ZopeMessageFactory as _
class IMultiForm(Interface):
Modified: z3c.multiform/Sandbox/src/z3c/multiform/multiform.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/multiform.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/multiform.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -9,12 +9,10 @@
from zope.formlib import form
from zope.formlib import namedtemplate
from zope.formlib.interfaces import IBoundAction
-from zope.formlib.i18n import _
-
-from interfaces import IMultiForm, IParentAction, IItemAction, ISelection
+from zope.app.i18n import ZopeMessageFactory as _
+from interfaces import *
from interfaces import IFormLocation,IItemForm
-
def isFormDisplayMode(f,action):
return not f.inputMode
@@ -46,7 +44,7 @@
def __init__(self, label, **options):
self.inputMode = options.pop('inputMode',None)
super(ItemAction,self).__init__(label,**options)
-
+
class ParentAction(form.Action):
"""an action that is rendered in the parent multiform object and
@@ -97,7 +95,7 @@
class parentAction(form.action):
-
+
def __call__(self, success):
action = ParentAction(self.label, success=success, **self.options)
self.actions.append(action)
@@ -163,7 +161,17 @@
if IParentAction.providedBy(action)]
return form.availableActions(self, actions)
+# copy from formlib with get
+def availableActions(form, actions):
+ result = []
+ for action in actions:
+ condition = action.condition
+ if (condition is None) or condition(form, action):
+ result.append(action)
+ return result
+
+
class MultiFormBase(form.FormBase):
implements(IMultiForm)
@@ -311,6 +319,9 @@
action = self.itemFormFactory.actions.byname[actionName]
action = copy.copy(action)
action.__name__ = name
+ # we need the form here to render, maybe we can do
+ # this somehow with an Actions object (__get__)
+ action.form = self
yield action
Modified: z3c.multiform/Sandbox/src/z3c/multiform/selection.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/selection.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/selection.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -95,7 +95,7 @@
>>> p2 = pickle.dumps(p)
Traceback (most recent call last):
...
- TypeError: Not picklable
+ PicklingError: Can't pickle <class 'z3c.multiform.selection.L'...
Proxies should get their doc strings from the object they proxy:
Modified: z3c.multiform/Sandbox/src/z3c/multiform/tests.py
===================================================================
--- z3c.multiform/Sandbox/src/z3c/multiform/tests.py 2006-06-01 20:28:04 UTC (rev 68452)
+++ z3c.multiform/Sandbox/src/z3c/multiform/tests.py 2006-06-02 07:15:20 UTC (rev 68453)
@@ -95,7 +95,7 @@
return unittest.TestSuite(
(
- DocTestSuite('multiform.selection',
+ DocTestSuite('z3c.multiform.selection',
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
),
DocFileSuite('README.txt',
More information about the Checkins
mailing list