# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1239953849 -7200 # Node ID ae58c2e7e1f7fd7765fe3d7a0d213039c4c2897d # Parent 6d5f0ccf31b8d495c9f18024e94b4a431e58a295 clear label handling diff -r 6d5f0ccf31b8 -r ae58c2e7e1f7 web/formwidgets.py --- a/web/formwidgets.py Fri Apr 17 09:32:57 2009 +0200 +++ b/web/formwidgets.py Fri Apr 17 09:37:29 2009 +0200 @@ -346,7 +346,11 @@ # buttons ###################################################################### class Button(Input): - """, base class for global form buttons""" + """, base class for global form buttons + + note label is a msgid which will be translated at form generation time, you + should not give an already translated string. + """ type = 'button' def __init__(self, label=stdmsgs.BUTTON_OK, attrs=None, setdomid=None, settabindex=None, @@ -392,6 +396,9 @@ class ImgButton(object): """ wrapped into a tag with href triggering something (usually a javascript call) + + note label is a msgid which will be translated at form generation time, you + should not give an already translated string. """ def __init__(self, domid, href, label, imgressource): self.domid = domid @@ -400,8 +407,13 @@ self.label = label def render(self, form, field=None): - self.imgsrc = form.req.external_resource(self.imgressource) - return '%(label)s%(label)s' % self.__dict__ + label = form.req._(self.label) + imgsrc = form.req.external_resource(self.imgressource) + return ''\ + '%(label)s%(label)s' % { + 'label': label, 'imgsrc': imgsrc, + 'domid': self.domid, 'href': self.href} + # XXX EntityLinkComboBoxWidget, [Raw]DynamicComboBoxWidget