[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/ - never use i18n messages as tokens

[Yvo Schubbe]

Log message for revision 119626:
  - never use i18n messages as tokens

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/interfaces.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/interfaces.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/interfaces.py	2011-01-17 16:21:36 UTC (rev 119625)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/interfaces.py	2011-01-17 16:31:10 UTC (rev 119626)
@@ -20,13 +20,13 @@
 from zope.schema import Bool
 from zope.schema import Choice
 from zope.schema import TextLine
-from zope.schema.vocabulary import SimpleVocabulary
 
+from Products.CMFDefault.formlib.vocabulary import SimpleVocabulary
 from Products.CMFDefault.utils import Message as _
 
-email_policy = SimpleVocabulary.fromItems([
-    (_(u"Generate and email members' initial password"), True),
-    (_(u"Allow members to select their initial password"), False)])
+available_policies = (
+    (u'email', True, _(u"Generate and email members' initial password")),
+    (u'select', False, _(u"Allow members to select their initial password")))
 
 def check_encoding(value):
     encoding = ""
@@ -74,7 +74,7 @@
 
     validate_email = Choice(
         title=_(u"Password policy"),
-        vocabulary=email_policy,
+        vocabulary=SimpleVocabulary.fromTitleItems(available_policies),
         default=False)
 
     default_charset = ASCIILine(

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py	2011-01-17 16:21:36 UTC (rev 119625)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py	2011-01-17 16:31:10 UTC (rev 119626)
@@ -20,20 +20,19 @@
 from zope.schema import Choice
 from zope.schema import Datetime
 from zope.schema import Int
-from zope.schema.vocabulary import SimpleVocabulary
 
 from Products.CMFCore.interfaces import ISyndicationInfo
 from Products.CMFDefault.browser.utils import memoize
 from Products.CMFDefault.formlib.form import EditFormBase
+from Products.CMFDefault.formlib.vocabulary import SimpleVocabulary
 from Products.CMFDefault.utils import Message as _
 
-frequency_vocab = SimpleVocabulary.fromItems(
-    [(_(u'Hourly'), 'hourly'),
-     (_(u'Daily'), 'daily'),
-     (_(u'Weekly'), 'weekly'),
-     (_(u'Monthly'), 'monthly'),
-     (_(u'Yearly'), 'yearly')
-     ])
+available_periods = (
+    (u'hourly', 'hourly', _(u'Hourly')),
+    (u'daily', 'daily', _(u'Daily')),
+    (u'weekly', 'weekly', _(u'Weekly')),
+    (u'monthly', 'monthly', _(u'Monthly')),
+    (u'yearly', 'yearly', _(u'Yearly')))
 
 
 class ISyndicationSchema(Interface):
@@ -42,7 +41,7 @@
 
     period = Choice(
         title=_(u"Update period"),
-        vocabulary=frequency_vocab,
+        vocabulary=SimpleVocabulary.fromTitleItems(available_periods),
         default="daily"
     )