[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - normalized some i18n messages
Yvo Schubbe
y.2011 at wcm-solutions.de
Fri Jan 21 06:02:41 EST 2011
Log message for revision 119821:
- normalized some i18n messages
- added XXX comments to broken syndication forms
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/join_form.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -63,6 +63,7 @@
)
+# XXX: Don't use this form, it might corrupt your settings!
class Site(EditFormBase):
"""Enable or disable syndication for a site."""
@@ -75,19 +76,19 @@
actions = form.Actions(
form.Action(
name="enable",
- label=_(u"Enable syndication"),
+ label=_(u"Enable Syndication"),
condition="disabled",
success="handle_enable",
),
form.Action(
- name="update",
- label=_(u"Update syndication"),
+ name="change",
+ label=_(u"Change"),
condition="enabled",
- success="handle_update",
+ success="handle_change",
),
form.Action(
name="disable",
- label=_(u"Disable syndication"),
+ label=_(u"Disable Syndication"),
condition="enabled",
success="handle_disable"
)
@@ -124,13 +125,13 @@
self.status = _(u"Syndication enabled.")
self._setRedirect("portal_actions", "global/syndication")
- def handle_update(self, action, data):
+ def handle_change(self, action, data):
self.syndtool.editProperties(updatePeriod=data['period'],
updateFrequency=data['frequency'],
updateBase=data['base'],
max_items=data['max_items']
)
- self.status = _(u"Syndication settings updated.")
+ self.status = _(u"Syndication settings changed.")
self._setRedirect("portal_actions", "global/syndication")
def handle_disable(self, action, data):
@@ -139,6 +140,7 @@
self._setRedirect("portal_actions", "global/syndication")
+# XXX: Don't use this form, it might corrupt your settings!
class Syndicate(EditFormBase):
"""Enable, disable and customise syndication settings for a folder.
@@ -151,25 +153,25 @@
actions = form.Actions(
form.Action(
name="enable",
- label=_(u"Enable syndication"),
+ label=_(u"Enable Syndication"),
condition="disabled",
success="handle_enable",
),
form.Action(
- name="update",
- label=_(u"Update syndication"),
+ name="change",
+ label=_(u"Change"),
condition="enabled",
- success="handle_update",
+ success="handle_change",
),
form.Action(
name="revert",
- label=_(u"Revert to site default"),
+ label=_(u"Revert to Site Default"),
condition="enabled",
success="handle_revert",
),
form.Action(
name="disable",
- label=_(u"Disable syndication"),
+ label=_(u"Disable Syndication"),
condition="enabled",
success="handle_disable",
)
@@ -213,9 +215,9 @@
self.status = _(u"Syndication disabled.")
self._setRedirect("portal_actions", "object/syndication")
- def handle_update(self, action, data):
+ def handle_change(self, action, data):
self.adapter.set_info(**data)
- self.status = _(u"Syndication settings updated.")
+ self.status = _(u"Syndication settings changed.")
self._setRedirect("portal_actions", "object/syndication")
def handle_revert(self, action, data):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -77,7 +77,7 @@
"http://www.foobar.com/bar/site?portal_status_message="
"Syndication%20enabled.")
- def test_handle_update(self):
+ def test_handle_change(self):
view = self._getTargetClass()
self.assertEqual(view.syndtool.updatePeriod, 'daily')
self.assertEqual(view.syndtool.updateFrequency, 1)
@@ -85,15 +85,15 @@
self.assertEqual(view.syndtool.max_items, 15)
data = {'frequency':3, 'period':'weekly', 'base':'active',
'max_items':10}
- view.handle_update("update", data)
+ view.handle_change("change", data)
self.assertEqual(view.syndtool.updatePeriod, 'weekly')
self.assertEqual(view.syndtool.updateFrequency, 3)
self.assertEqual(view.syndtool.updateBase, "active")
self.assertEqual(view.syndtool.max_items, 10)
- self.assertEqual(view.status, u"Syndication settings updated.")
+ self.assertEqual(view.status, u"Syndication settings changed.")
self.assertEqual(view.request.RESPONSE.location,
"http://www.foobar.com/bar/site?portal_status_message="
- "Syndication%20settings%20updated.")
+ "Syndication%20settings%20changed.")
def test_handle_disable(self):
view = self._getTargetClass()
@@ -167,22 +167,22 @@
"http://www.foobar.com/bar/site?portal_status_message="
"Syndication%20disabled.")
- def test_handle_update(self):
+ def test_handle_change(self):
view = self._getTargetClass()
values = {'frequency': 4, 'period': 'weekly', 'base': '2010-01-01',
'max_items': 25}
- view.handle_update("update", values)
+ view.handle_change("change", values)
self.assertEqual(view.adapter.get_info(), values)
- self.assertEqual(view.status, u"Syndication settings updated.")
+ self.assertEqual(view.status, u"Syndication settings changed.")
self.assertEqual(view.request.RESPONSE.location,
"http://www.foobar.com/bar/site?portal_status_message="
- "Syndication%20settings%20updated.")
+ "Syndication%20settings%20changed.")
def test_handle_revert(self):
view = self._getTargetClass()
values = {'frequency': 4, 'period': 'weekly', 'base': '2010-01-01',
'max_items': 25}
- view.handle_update("update", values)
+ view.handle_change("change", values)
view.handle_revert("", values)
self.assertNotEqual(view.adapter.get_info(), values)
self.assertEqual(view.status, u"Syndication reset to site default.")
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/configure.zcml 2011-01-21 11:02:40 UTC (rev 119821)
@@ -61,7 +61,7 @@
<utility
component=".preferences.portal_skins"
provides="zope.schema.interfaces.IVocabularyFactory"
- name="cmf.portal_skins"
+ name="cmf.AvailableSkins"
/>
<browser:page
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -54,7 +54,8 @@
def check_passwords_match(schema):
"""Password and confirmation must match"""
if schema.password != schema.confirmation:
- raise Invalid(_(u"Passwords do not match"))
+ raise Invalid(_(u"Your password and confirmation did not match. "
+ u"Please try again."))
class Join(EditFormBase):
@@ -101,7 +102,7 @@
@property
def title(self):
if self.isManager:
- return _(u"Register a new member")
+ return _(u"Register a New Member")
else:
return _(u'Become a Member')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/password.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -14,16 +14,16 @@
"""
from DateTime import DateTime
-
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.formlib import form
-from zope.interface import Interface, invariant, Invalid
-from zope.schema import ASCIILine, Password, List, TextLine
+from zope.interface import Interface
+from zope.interface import Invalid
+from zope.interface import invariant
+from zope.schema import Password
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-
from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.formlib.form import EditFormBase
from Products.CMFDefault.utils import Message as _
-from Products.CMFDefault.formlib.form import EditFormBase
class IPasswordSchema(Interface):
@@ -42,7 +42,8 @@
def check_passwords_match(schema):
"""Password and confirmation must match"""
if schema.password != schema.confirmation:
- raise Invalid(_(u"Passwords do not match"))
+ raise Invalid(_(u"Your password and confirmation did not match. "
+ u"Please try again."))
class Password(EditFormBase):
@@ -52,7 +53,7 @@
actions = form.Actions(
form.Action(
name="change",
- label=_(u"Change password"),
+ label=_(u"Change"),
success="handle_success",
failure="handle_failure"
)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -39,9 +39,9 @@
title=_(u"Listed status"),
description=_(u"Select to be listed on the public membership roster."))
- portal_skin = Choice(
+ skin = Choice(
title=_(u"Skin"),
- vocabulary=u"cmf.portal_skins",
+ vocabulary=u"cmf.AvailableSkins",
required=False)
@@ -57,7 +57,7 @@
failure="handle_failure"
)
)
- label = _(u"Member preferences")
+ label = _(u"Member Preferences")
def __init__(self, context, request):
super(Preferences, self).__init__(context, request)
@@ -80,7 +80,7 @@
data = {}
data['email'] = self.member.email
data['listed'] = getattr(self.member, 'listed', None)
- data['portal_skin'] = self.get_skin_cookie()
+ data['skin'] = self.get_skin_cookie()
self.widgets = form.setUpDataWidgets(self.form_fields,
self.prefix,
@@ -90,7 +90,7 @@
ignore_request=False)
def handle_success(self, action, data):
- if 'portal_skin' in data:
+ if 'skin' in data:
self.stool.portal_skins.updateSkinCookie()
self.member.setProperties(data)
self.status = _(u"Member preferences changed.")
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt 2011-01-21 11:02:40 UTC (rev 119821)
@@ -41,7 +41,7 @@
Add a new member
>>> browser.getControl(name="form.actions.new").click()
- >>> "[[cmf_default][Register Member]]" in browser.contents
+ >>> "[[cmf_default][Register a New Member]]" in browser.contents
True
Click delete with no member selected
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/password.txt 2011-01-21 11:02:40 UTC (rev 119821)
@@ -24,7 +24,7 @@
>>> browser.getControl('[[cmf_default][Login]]').click()
>>> '[[cmf_default][Login success]]' in browser.contents
True
-
+
Open the join form. Password field should be visible
>>> browser.open("http://localhost/site/@@password.html")
@@ -33,10 +33,10 @@
>>> browser.getControl(name='form.password').value = 'new password'
>>> browser.getControl(name='form.confirmation').value = 'is invalid'
>>> browser.getControl(name='form.actions.change').click()
- >>> '[[cmf_default][Passwords do not match]]' in browser.contents
+ >>> '[[cmf_default][Your password and confirmation' in browser.contents
True
>>> browser.getControl(name='form.password').value = 'new password'
>>> browser.getControl(name='form.confirmation').value = 'new password'
>>> browser.getControl(name='form.actions.change').click()
>>> '[[[cmf_default][Your password has been changed.]]' in browser.contents
- True
\ No newline at end of file
+ True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -12,4 +12,4 @@
ptool.editProperties(kw)
-return context.setStatus(True, _(u'CMF Settings changed.'))
+return context.setStatus(True, _(u'Portal settings changed.'))
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/join_form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/join_form.py 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/join_form.py 2011-01-21 11:02:40 UTC (rev 119821)
@@ -34,7 +34,7 @@
is_anon = False
is_newmember = True
-options['title'] = is_usermanager and _(u'Register Member') \
+options['title'] = is_usermanager and _(u'Register a New Member') \
or _(u'Become a Member')
options['member_id'] = member_id
options['member_email'] = member_email
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt 2011-01-21 10:40:40 UTC (rev 119820)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt 2011-01-21 11:02:40 UTC (rev 119821)
@@ -3,7 +3,7 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="s_tool options/s_tool">
-<h2 i18n:translate="">Default Syndication Properties</h2>
+<h2 i18n:translate="">Syndication Properties</h2>
<tal:case tal:condition="options/s_allowed"
><form action="editSynProperties" method="post"
@@ -56,11 +56,7 @@
<table>
<tr>
- <th align="left" i18n:translate="">Element</th>
- <th align="left" i18n:translate="">Default Value</th>
- </tr>
- <tr>
- <td i18n:translate="">UpdatePeriod</td>
+ <td i18n:translate="">Update period</td>
<td>
<select name="updatePeriod">
<option value="hourly"
@@ -75,7 +71,7 @@
</td>
</tr>
<tr>
- <td i18n:translate="">UpdateFrequency</td>
+ <td i18n:translate="">Update frequency</td>
<td>
<input type="text" name="updateFrequency:int" size="3" value=""
tal:attributes="value python:s_tool.getUpdateFrequency(context)"
@@ -83,21 +79,21 @@
</td>
</tr>
<tr>
- <td i18n:translate="">UpdateBase</td>
+ <td i18n:translate="">Update base</td>
<td>
<input type="text" name="updateBase:date" value="" size="25"
tal:attributes="value python:s_tool.getUpdateBase(context)"/>
</td>
</tr>
<tr>
- <td i18n:translate="">Max Syndicated Items</td>
+ <td i18n:translate="">Maximum number of items</td>
<td>
<input type="text" name="max_items:int" value="" size="3"
tal:attributes="value python:s_tool.getMaxItems(context)"/>
</td>
</tr>
<tr>
- <td colspan="2"><input type="submit" name="edit" value="Save"
+ <td colspan="2"><input type="submit" name="edit" value="Change"
i18n:attributes="value"/></td>
</tr>
</table>
More information about the checkins
mailing list