[Checkins] SVN: z3c.form/trunk/ Changed radio button and checkbox widget labels from token to value (wrapped

[Stephan Richter]

Log message for revision 123936:
  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.
  
  

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/src/z3c/form/browser/checkbox.py
  U   z3c.form/trunk/src/z3c/form/browser/radio.py

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2012-01-04 11:34:31 UTC (rev 123935)
+++ z3c.form/trunk/CHANGES.txt	2012-01-04 11:59:48 UTC (rev 123936)
@@ -8,6 +8,11 @@
 - 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).
 

Modified: z3c.form/trunk/src/z3c/form/browser/checkbox.py
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/checkbox.py	2012-01-04 11:34:31 UTC (rev 123935)
+++ z3c.form/trunk/src/z3c/form/browser/checkbox.py	2012-01-04 11:59:48 UTC (rev 123936)
@@ -47,7 +47,7 @@
         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)

Modified: z3c.form/trunk/src/z3c/form/browser/radio.py
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/radio.py	2012-01-04 11:34:31 UTC (rev 123935)
+++ z3c.form/trunk/src/z3c/form/browser/radio.py	2012-01-04 11:59:48 UTC (rev 123936)
@@ -46,7 +46,7 @@
         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)