merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 09 Dec 2009 11:31:31 +0100
changeset 91 969e27376b0c
parent 90 039463d73a6e (current diff)
parent 89 4985b1ea1d10 (diff)
child 92 87b2293a11df
merge
--- a/debian/control	Wed Dec 09 11:30:32 2009 +0100
+++ b/debian/control	Wed Dec 09 11:31:31 2009 +0100
@@ -11,7 +11,7 @@
 Conflicts: cubicweb-keywords
 Replaces: cubicweb-keywords
 Architecture: all
-Depends: cubicweb-common (>= 3.0.0)
+Depends: cubicweb-common (>= 3.5.5)
 Description: keyword component for the Cubicweb framework
  This Cubicweb component provides classification (hierarchies of keywords)
  to classify content. See also cubicweb-tag.
--- a/schema.py	Wed Dec 09 11:30:32 2009 +0100
+++ b/schema.py	Wed Dec 09 11:31:31 2009 +0100
@@ -10,6 +10,8 @@
 from cubicweb.schema import RQLConstraint, ERQLExpression
 
 
+_ = unicode
+
 class Classification(EntityType):
     """classification schemes are used by users to classify entities.
     """
--- a/views.py	Wed Dec 09 11:30:32 2009 +0100
+++ b/views.py	Wed Dec 09 11:31:31 2009 +0100
@@ -163,8 +163,8 @@
         entity = self.entity(0)
         self.w(u'<table><tr><td>')
         self.w(u'<a class="button sglink" href="javascript: showKeywordSelector(%s, \'%s\', \'%s\');">%s</a></td>' % (
-            entity.eid, self.req._(stdmsgs.BUTTON_OK),
-            self.req._(stdmsgs.BUTTON_CANCEL), self.req._('add keywords')))
+            entity.eid, self.req._(stdmsgs.BUTTON_OK[0]),
+            self.req._(stdmsgs.BUTTON_CANCEL[0]), self.req._('add keywords')))
         self.w(u'<td><div id="kwformholder"></div>')
         self.w(u'</td></tr></table>')