[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - normalized some i18n messages
Yvo Schubbe
y.2011 at wcm-solutions.de
Fri Jan 14 07:09:13 EST 2011
Log message for revision 119581:
- normalized some i18n messages
- wrapped some long lines
- cleaned up imports and whitespace
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.pt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2011-01-14 12:09:13 UTC (rev 119581)
@@ -13,43 +13,42 @@
"""Join form.
"""
-from zope.interface import Interface, invariant, Invalid
-from zope.schema import ASCIILine, Password, Bool
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.formlib import form
+from zope.interface import Interface
+from zope.interface import Invalid
+from zope.interface import invariant
+from zope.schema import ASCIILine
+from zope.schema import Bool
+from zope.schema import Password
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from Products.CMFDefault.formlib.form import EditFormBase
from Products.CMFDefault.formlib.schema import EmailLine
from Products.CMFDefault.permissions import ManageUsers
-
from Products.CMFDefault.utils import Message as _
class IJoinSchema(Interface):
- """Zope generates password and sends it by e-mail"""
+ """Zope generates password and sends it by email"""
member_id = ASCIILine(
- title=_(u"Member ID")
- )
+ title=_(u"Member ID"))
email = EmailLine(
- title=_(u"E-mail address")
- )
+ title=_(u"Email Address"))
password = Password(
- title=_(u"Password"),
- min_length=5
- )
+ title=_(u"Password"),
+ min_length=5)
confirmation = Password(
- title=_(u"Password (confirm)"),
- min_length=5
- )
+ title=_(u"Password (confirm)"),
+ min_length=5)
send_password = Bool(
- title=_(u"Mail Password?"),
- description=_(u"Check this box to have the password mailed."))
+ title=_(u"Mail Password?"),
+ description=_(u"Check this box to have the password mailed."))
@invariant
def check_passwords_match(schema):
@@ -107,7 +106,7 @@
return _(u'Become a Member')
def setUpWidgets(self, ignore_request=False):
- """If e-mail validation is in effect, users cannot select passwords"""
+ """If email validation is in effect, users cannot select passwords"""
super(Join, self).setUpWidgets(ignore_request)
def personalize(self):
@@ -119,7 +118,8 @@
errors = super(Join, self).validate(action, data)
member = self.mtool.getMemberById(data.get('member_id', None))
if member is not None:
- errors.append(_(u"The login name you selected is already in use or is not valid. Please choose another."))
+ errors.append(_(u"The login name you selected is already in use "
+ u"or is not valid. Please choose another."))
return errors
def add_member(self, data):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.txt 2011-01-14 12:09:13 UTC (rev 119581)
@@ -2,7 +2,7 @@
------------------
Anonymous users can join the portal
-If the portal requires e-mail validation then the portal assigns the password and sends it by e-mail
+If the portal requires email validation then the portal assigns the password and sends it by email
User names cannot be duplicates
Passwords must be at least 5 characters long
A password confirmation must be supplied
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.pt 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.pt 2011-01-14 12:09:13 UTC (rev 119581)
@@ -21,7 +21,7 @@
<tr class="list-header">
<td> </td>
<th i18n:translate="">Member</th>
- <th i18n:translate="">E-mail Address</th>
+ <th i18n:translate="">Email Address</th>
<th i18n:translate="">Last Login</th>
</tr>
</thead>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py 2011-01-14 12:09:13 UTC (rev 119581)
@@ -10,30 +10,27 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-""" Forms for managing members """
+"""Forms for managing members.
+"""
-from logging import getLogger
-
-from zope.interface import Interface
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.formlib import form
-from zope.schema import Bool, TextLine, Date, getFieldsInOrder, List, Choice
+from zope.interface import Interface
+from zope.schema import Bool
+from zope.schema import Date
+from zope.schema import TextLine
from zope.sequencesort.ssort import sort
-
from ZTUtils import LazyFilter
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-
-from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.browser.content.folder import BatchViewBase
+from Products.CMFDefault.browser.content.interfaces import IBatchForm
+from Products.CMFDefault.browser.utils import memoize
from Products.CMFDefault.formlib.form import EditFormBase
-from Products.CMFDefault.formlib.schema import EmailLine
from Products.CMFDefault.utils import Message as _
-from Products.CMFDefault.browser.utils import memoize
-from Products.CMFDefault.browser.content.folder import BatchViewBase
-from Products.CMFDefault.browser.content.interfaces import IBatchForm
-
class IMemberItem(Interface):
+
"""Schema for portal members """
select = Bool(
@@ -46,7 +43,7 @@
)
email = TextLine(
- title=_(u"E-mail Address"),
+ title=_(u"Email Address"),
required=False,
readonly=True
)
@@ -59,6 +56,7 @@
class MemberProxy(object):
+
"""Utility class wrapping a member for display purposes"""
def __init__(self, member):
@@ -168,12 +166,12 @@
"""Delete selected members"""
mtool = self._getTool('portal_membership')
mtool.deleteMembers(self._get_ids(data))
- self.status = _(u"Selected members deleted")
+ self.status = _(u"Selected members deleted.")
self._setRedirect('portal_actions', "global/manage_members")
def handle_cancel(self, action, data):
"""Don't delete anyone, return to list"""
- self.status = _(u"Deletion broken off")
+ self.status = _(u"Deletion broken off.")
self._setRedirect('portal_actions', "global/manage_members")
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py 2011-01-14 12:09:13 UTC (rev 119581)
@@ -13,16 +13,17 @@
"""Change user preferences.
"""
-from zope.schema import Choice, Bool
-from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-from zope.interface import Interface
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.formlib import form
+from zope.interface import Interface
+from zope.schema import Bool
+from zope.schema import Choice
+from zope.schema.vocabulary import SimpleVocabulary
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.CMFCore.utils import Message as _
from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.formlib.schema import EmailLine
from Products.CMFDefault.formlib.form import EditFormBase
+from Products.CMFDefault.formlib.schema import EmailLine
+from Products.CMFDefault.utils import Message as _
def portal_skins(context):
@@ -33,18 +34,16 @@
class IPreferencesSchema(Interface):
email = EmailLine(
- title=_(u"E-mail address")
- )
+ title=_(u"Email Address"))
listed = Bool(
- title=_(u"Listed status"),
- description=_(u"Select to be listed on the public membership roster.")
- )
+ title=_(u"Listed status"),
+ description=_(u"Select to be listed on the public membership roster."))
portal_skin = Choice(
- title=_(u"Skin"),
- vocabulary=u"cmf.portal_skins",
- required=False)
+ title=_(u"Skin"),
+ vocabulary=u"cmf.portal_skins",
+ required=False)
class Preferences(EditFormBase):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.txt 2011-01-14 12:09:13 UTC (rev 119581)
@@ -3,7 +3,7 @@
Only user can change his own preference
User can change the following preferences:
-E-mail address
+Email address
Listed or unlisted
User's chosen skin if set
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/members.txt 2011-01-14 12:09:13 UTC (rev 119581)
@@ -55,10 +55,10 @@
>>> browser.getControl(name="form.actions.select").click()
>>> "[[cmf_default][The following members - including all their data, home folders and roles - are selected for deletion" in browser.contents
True
-
+
Cancel deletion
>>> browser.getControl(name="form.actions.cancel").click()
- >>> "[[cmf_default][Deletion broken off]" in browser.contents
+ >>> "[[cmf_default][Deletion broken off.]" in browser.contents
True
Delete selected member
@@ -66,15 +66,15 @@
>>> browser.getControl(name="form.Bob.select").value = True
>>> browser.getControl(name="form.actions.select").click()
>>> browser.getControl(name="form.actions.delete").click()
- >>> "[[cmf_default][Selected members deleted]" in browser.contents
+ >>> "[[cmf_default][Selected members deleted.]" in browser.contents
True
Test batching. Add lots of users
>>> for user in ["Alice", "Bob", "Carol", "Dave", "Ted", "Eve", "Mallory", "Marvin", "Oscar", "Peggy", "Victor", "Trudy", "Trent", "Charlie", "Isaac", "Ivan", "Justin", "Matilda", "Oscar", "Plod", "Walter", "Zoe", "Peter", "Sven", "Gloria", "James", "Albert", "Edward", "Michael", "Quentin", "Richard", "Kate", "Freddy", "George", "Harry", "Lucy", "Nicholas", "Terry", "Thomas", "Unwin", "William", "Vince", "Xavier", "Yossarian"]:
- ... app.site.portal_membership.addMember(user,
+ ... app.site.portal_membership.addMember(user,
... "secret", ("Owner",), ())
>>> browser.open("http://localhost/site/@@members.html")
>>> "[[cmf_default][Next 18 items]]" in browser.contents
True
>>> 'a href="http://localhost/site/@@members.html?form.b_start=25">2</a>' in browser.contents
- True
\ No newline at end of file
+ True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt 2011-01-14 12:09:13 UTC (rev 119581)
@@ -24,9 +24,9 @@
>>> browser.getControl('[[cmf_default][Login]]').click()
>>> '[[cmf_default][Login success]]' in browser.contents
True
-
-Open the preferences form. E-mail field should be visible
+Open the preferences form. Email field should be visible
+
>>> browser.open("http://localhost/site/@@preferences.html")
>>> browser.getControl(name='form.email').value == ''
True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py 2011-01-14 11:52:55 UTC (rev 119580)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_join.py 2011-01-14 12:09:13 UTC (rev 119581)
@@ -76,7 +76,7 @@
pass
def test_successful_registration_validation_required(self):
- # note that password will be sent by e-mail
+ # note that password will be sent by email
pass
More information about the checkins
mailing list