Changed radio button and checkbox widget labels from token to value (…

…wrapped

by a unicode conversion) to make it consistent with the parent
``SequenceWidget`` class. This way, edit and display views of the widgets
show the same label. See LP623210.

CHANGES.txt

@@ -8,6 +8,11 @@ CHANGES
 - Remove ":list" from radio inputs, since radio buttons can be only one value
   by definition. See LP580840.
 
+- Changed radio button and checkbox widget labels from token to value (wrapped
+  by a unicode conversion) to make it consistent with the parent
+  ``SequenceWidget`` class. This way, edit and display views of the widgets
+  show the same label. See LP623210.
+
 - Remove dependency on zope.site.hooks, which was moved to zope.component in
   3.8.0 (present in ZTK 1.0 and above).
 

src/z3c/form/browser/checkbox.py

@@ -47,7 +47,7 @@ def update(self):
         for count, term in enumerate(self.terms):
             checked = self.isChecked(term)
             id = '%s-%i' % (self.id, count)
-            label = term.token
+            label = unicode(term.value)
             if zope.schema.interfaces.ITitledTokenizedTerm.providedBy(term):
                 label = translate(term.title, context=self.request,
                                   default=term.title)

src/z3c/form/browser/radio.py

@@ -46,7 +46,7 @@ def update(self):
         for count, term in enumerate(self.terms):
             checked = self.isChecked(term)
             id = '%s-%i' % (self.id, count)
-            label = term.token
+            label = unicode(term.value)
             if zope.schema.interfaces.ITitledTokenizedTerm.providedBy(term):
                 label = translate(term.title, context=self.request,
                                   default=term.title)