# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1260798577 -3600
# Node ID b33a9f3e19d685c71297a0d718ea9d7b36949ed0
# Parent  1fda1d356741ee8cc58db4cb92738ef9f14e67f9# Parent  eb4722dd5f8689d4f6a3b0826ce4b481ef8a0b5e
merge

diff -r 1fda1d356741 -r b33a9f3e19d6 server/hooks.py
--- a/server/hooks.py	Mon Dec 14 14:49:18 2009 +0100
+++ b/server/hooks.py	Mon Dec 14 14:49:37 2009 +0100
@@ -537,7 +537,9 @@
                 raise ValidationError(entity.eid, {'by_transition': msg})
             if not tr.has_input_state(fromstate):
                 _ = session._
-                msg = _("transition %s isn't allowed from %s") % (_(tr.name), _(fromstate.name))
+                msg = _("transition %(tr)s isn't allowed from %(st)s") % {'tr': _(tr.name),
+                                                                          'st': _(fromstate.name),
+                                                                          }
                 raise ValidationError(entity.eid, {'by_transition': msg})
             if not tr.may_be_fired(foreid):
                 msg = session._("transition may not be fired")
diff -r 1fda1d356741 -r b33a9f3e19d6 web/views/formrenderers.py
--- a/web/views/formrenderers.py	Mon Dec 14 14:49:18 2009 +0100
+++ b/web/views/formrenderers.py	Mon Dec 14 14:49:37 2009 +0100
@@ -457,7 +457,6 @@
                 w(u'</tr>')
         w(u'<tr id="relationSelectorRow_%s" class="separator">' % eid)
         w(u'<th class="labelCol">')
-        w(u'<span>%s</span>' % _('add relation'))
         w(u'<select id="relationSelector_%s" tabindex="%s" '
           'onchange="javascript:showMatchingSelect(this.options[this.selectedIndex].value,%s);">'
           % (eid, req.next_tabindex(), xml_escape(dumps(eid))))