[CMF-checkins] SVN: CMF/trunk/C sorry for the noise,
just renaming some recently added files
Yvo Schubbe
y.2006_ at wcm-solutions.de
Thu Feb 16 04:19:02 EST 2006
Log message for revision 41632:
sorry for the noise, just renaming some recently added files
Changed:
U CMF/trunk/CHANGES.txt
U CMF/trunk/CMFDefault/RegistrationTool.py
U CMF/trunk/CMFDefault/locales/cmf_default.pot
D CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py
D CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail_template.pt
D CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py
D CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail_template.pt
A CMF/trunk/CMFDefault/skins/zpt_generic/password_email.py
A CMF/trunk/CMFDefault/skins/zpt_generic/password_email_template.pt
A CMF/trunk/CMFDefault/skins/zpt_generic/registered_email.py
A CMF/trunk/CMFDefault/skins/zpt_generic/registered_email_template.pt
-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CHANGES.txt 2006-02-16 09:19:01 UTC (rev 41632)
@@ -184,9 +184,9 @@
Others
- CMFDefault RegistrationTool and skins: Refactored mail creation.
- 'mailPassword' now calls the 'member_password_mail' script and
- 'registeredNotify' the 'member_registered_mail' script. These scripts
- call the templates and do the necessary string decoding and encoding.
+ 'mailPassword' now calls the 'password_email' script and
+ 'registeredNotify' the 'registered_email' script. These scripts call the
+ templates and do the necessary string decoding and encoding.
- CMFDefault skins: Refactored 'logged_in' page and 'password_form'.
'logged_in' now redirects to the 'password_form' if a new member has to
Modified: CMF/trunk/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/RegistrationTool.py 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/RegistrationTool.py 2006-02-16 09:19:01 UTC (rev 41632)
@@ -131,7 +131,7 @@
# Rather than have the template try to use the mailhost, we will
# render the message ourselves and send it from here (where we
# don't need to worry about 'UseMailHost' permissions).
- method = getattr(self, 'member_password_mail')
+ method = self.password_email
kw = {'member': member, 'password': member.getPassword()}
if getattr(aq_base(method), 'isDocTemp', 0):
@@ -172,7 +172,7 @@
# Rather than have the template try to use the mailhost, we will
# render the message ourselves and send it from here (where we
# don't need to worry about 'UseMailHost' permissions).
- method = getattr(self, 'member_registered_mail')
+ method = self.registered_email
kw = {'member': member, 'password': password, 'email': email}
if getattr(aq_base(method), 'isDocTemp', 0):
Modified: CMF/trunk/CMFDefault/locales/cmf_default.pot
===================================================================
--- CMF/trunk/CMFDefault/locales/cmf_default.pot 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/locales/cmf_default.pot 2006-02-16 09:19:01 UTC (rev 41632)
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: CMF 2.0\n"
-"POT-Creation-Date: Tue Feb 14 21:58:36 2006\n"
+"POT-Creation-Date: Thu Feb 16 09:16:59 2006\n"
"Language-Team: CMF Developers <zope-cmf at zope.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@
msgstr ""
#: CMFDefault/RegistrationTool.py:119
-#: CMFDefault/RegistrationTool.py:156
+#: CMFDefault/RegistrationTool.py:155
msgid "The username you entered could not be found."
msgstr ""
@@ -37,7 +37,7 @@
msgid "That user does not have an email address."
msgstr ""
-#: CMFDefault/RegistrationTool.py:165
+#: CMFDefault/RegistrationTool.py:164
# Default: ""
msgid "No email address is registered for member: ${member_id}"
msgstr ""
@@ -1160,14 +1160,14 @@
#: CMFDefault/skins/zpt_generic/join_template.pt:59
#: CMFDefault/skins/zpt_generic/login_form.pt:24
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:27
#: CMFDefault/skins/zpt_generic/password_form_template.pt:26
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:27
msgid "Member ID"
msgstr ""
#: CMFDefault/skins/zpt_generic/join_template.pt:73
#: CMFDefault/skins/zpt_generic/login_form.pt:31
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:29
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:29
msgid "Password"
msgstr ""
@@ -1267,46 +1267,6 @@
msgid "search"
msgstr ""
-#: CMFDefault/skins/zpt_generic/member_password_mail_template.pt:13
-msgid "Request made by IP ${ip} at ${time}"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_password_mail_template.pt:2
-msgid "${portal_title}: Membership reminder"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_password_mail_template.pt:8
-msgid "Your password: ${password}"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:10
-msgid "You have been registered as a member of \"${portal_title}\", which allows you to personalize your view of the website and participate in the community."
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:15
-msgid "This describes the purpose of the website:"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:2
-msgid "${portal_title}: Your Membership Information"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:21
-msgid "Visit us at ${portal_url}"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:24
-msgid "Here is your login data (mind upper and lower case):"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:32
-msgid "You can use this URL to log in:"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/member_registered_mail_template.pt:37
-msgid "Be aware that this URL might wrap over two lines. If your browser shows an error message when you try to access the URL please make sure that you put in the complete string."
-msgstr ""
-
#: CMFDefault/skins/zpt_generic/members_delete_template.pt:15
msgid "The following members - including all their data, home folders and roles - are selected for deletion:"
msgstr ""
@@ -1443,6 +1403,18 @@
msgid "News"
msgstr ""
+#: CMFDefault/skins/zpt_generic/password_email_template.pt:13
+msgid "Request made by IP ${ip} at ${time}"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_email_template.pt:2
+msgid "${portal_title}: Membership reminder"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/password_email_template.pt:8
+msgid "Your password: ${password}"
+msgstr ""
+
#: CMFDefault/skins/zpt_generic/password_form.py:29
msgid "Welcome!"
msgstr ""
@@ -1591,6 +1563,34 @@
msgid "Charset used to decode portal content strings. If empty, 'ascii' is used."
msgstr ""
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:10
+msgid "You have been registered as a member of \"${portal_title}\", which allows you to personalize your view of the website and participate in the community."
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:15
+msgid "This describes the purpose of the website:"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:2
+msgid "${portal_title}: Your Membership Information"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:21
+msgid "Visit us at ${portal_url}"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:24
+msgid "Here is your login data (mind upper and lower case):"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:32
+msgid "You can use this URL to log in:"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/registered_email_template.pt:37
+msgid "Be aware that this URL might wrap over two lines. If your browser shows an error message when you try to access the URL please make sure that you put in the complete string."
+msgstr ""
+
#: CMFDefault/skins/zpt_generic/review.pt:106
msgid "There are no items matching your specified criteria."
msgstr ""
Deleted: CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py 2006-02-16 09:19:01 UTC (rev 41632)
@@ -1,29 +0,0 @@
-##parameters=member=None, password='baz'
-##
-from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import decode
-
-atool = getToolByName(script, 'portal_actions')
-ptool = getToolByName(script, 'portal_properties')
-utool = getToolByName(script, 'portal_url')
-default_charset = ptool.getProperty('default_charset')
-portal_url = utool()
-
-
-options = {}
-
-email_from_name = ptool.getProperty('email_from_name')
-email_from_address = ptool.getProperty('email_from_address')
-options['portal_address'] = '%s <%s>' % (email_from_name, email_from_address)
-member_address = member and member.email or 'foo at example.org'
-options['member_address'] = '<%s>' % member_address
-options['content_type'] = 'text/plain; charset=%s' % default_charset
-
-options['portal_title'] = ptool.title()
-options['password'] = password
-
-rendered = context.member_password_mail_template(**decode(options, script))
-if isinstance(rendered, unicode):
- return rendered.encode(default_charset)
-else:
- return rendered
Deleted: CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail_template.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail_template.pt 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail_template.pt 2006-02-16 09:19:01 UTC (rev 41632)
@@ -1,15 +0,0 @@
-<tal:page i18n:domain="cmf_default"
->Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
- tal:content="options/portal_title" />: Membership reminder</tal:span>
-From: <tal:span tal:replace="structure options/portal_address" />
-To: <tal:span tal:replace="structure options/member_address" />
-Content-Type: <tal:span tal:replace="structure options/content_type" />
-
-<tal:span i18n:translate="">Your password: <tal:span i18n:name="password"
- tal:content="options/password | default">baz</tal:span></tal:span>
-
-<tal:span i18n:translate="">Request made by IP <tal:span i18n:name="ip"
- tal:define="ip python:request.HTTP_X_FORWARDED_FOR or request.REMOTE_ADDR"
- tal:content="ip" /> at <tal:span i18n:name="time"
- tal:content="context/ZopeTime" /></tal:span>
-</tal:page>
Deleted: CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py 2006-02-16 09:19:01 UTC (rev 41632)
@@ -1,37 +0,0 @@
-##parameters=member=None, password='baz', email='foo at example.org'
-##
-from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import decode
-
-atool = getToolByName(script, 'portal_actions')
-ptool = getToolByName(script, 'portal_properties')
-utool = getToolByName(script, 'portal_url')
-default_charset = ptool.getProperty('default_charset')
-portal_url = utool()
-
-
-options = {}
-
-email_from_name = ptool.getProperty('email_from_name')
-email_from_address = ptool.getProperty('email_from_address')
-options['portal_address'] = '%s <%s>' % (email_from_name, email_from_address)
-options['member_address'] = '<%s>' % email
-options['content_type'] = 'text/plain; charset=%s' % default_charset
-
-options['portal_title'] = ptool.title()
-options['portal_description'] = ptool.getProperty('description')
-options['portal_url'] = portal_url
-
-member_id = member and member.getId() or 'foo'
-options['member_id'] = member_id
-options['password'] = password
-
-target = atool.getActionInfo('user/login')['url']
-options['login_url'] = '%s' % target
-options['signature'] = email_from_name
-
-rendered = context.member_registered_mail_template(**decode(options, script))
-if isinstance(rendered, unicode):
- return rendered.encode(default_charset)
-else:
- return rendered
Deleted: CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail_template.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail_template.pt 2006-02-16 04:44:31 UTC (rev 41631)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail_template.pt 2006-02-16 09:19:01 UTC (rev 41632)
@@ -1,44 +0,0 @@
-<tal:page i18n:domain="cmf_default"
->Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
- tal:content="options/portal_title"
- />: Your Membership Information</tal:span>
-From: <tal:span tal:replace="structure options/portal_address" />
-To: <tal:span tal:replace="structure options/member_address" />
-Content-Type: <tal:span tal:replace="structure options/content_type" />
-
-<tal:span i18n:translate=""
->You have been registered as a member of "<tal:span i18n:name="portal_title"
- tal:content="options/portal_title" />", which
-allows you to personalize your view of the website and participate in the
-community.</tal:span>
-<tal:case tal:condition="options/portal_description">
-<tal:span i18n:translate=""
->This describes the purpose of the website:</tal:span>
-
-<tal:span tal:content="options/portal_description" />
-</tal:case>
-<tal:span i18n:translate=""
->Visit us at <tal:span i18n:name="portal_url"
- tal:content="options/portal_url" /></tal:span>
-
-<tal:span i18n:translate=""
->Here is your login data (mind upper and lower case):</tal:span>
-
-<tal:span i18n:translate=""
->Member ID</tal:span>: <tal:span tal:content="options/member_id" />
-<tal:span i18n:translate=""
->Password</tal:span>: <tal:span tal:content="options/password" />
-
-<tal:span i18n:translate=""
->You can use this URL to log in:</tal:span>
-
-<tal:span tal:content="options/login_url" />
-<tal:case tal:condition="python:len(options['login_url'])>70">
-<tal:span i18n:translate=""
->Be aware that this URL might wrap over two lines. If your browser shows an
-error message when you try to access the URL please make sure that you put
-in the complete string.</tal:span>
-</tal:case>
-
-<tal:span tal:content="options/signature" />
-</tal:page>
Copied: CMF/trunk/CMFDefault/skins/zpt_generic/password_email.py (from rev 41624, CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py)
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail.py 2006-02-15 10:18:11 UTC (rev 41624)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/password_email.py 2006-02-16 09:19:01 UTC (rev 41632)
@@ -0,0 +1,29 @@
+##parameters=member=None, password='baz'
+##
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import decode
+
+atool = getToolByName(script, 'portal_actions')
+ptool = getToolByName(script, 'portal_properties')
+utool = getToolByName(script, 'portal_url')
+default_charset = ptool.getProperty('default_charset')
+portal_url = utool()
+
+
+options = {}
+
+email_from_name = ptool.getProperty('email_from_name')
+email_from_address = ptool.getProperty('email_from_address')
+options['portal_address'] = '%s <%s>' % (email_from_name, email_from_address)
+member_address = member and member.email or 'foo at example.org'
+options['member_address'] = '<%s>' % member_address
+options['content_type'] = 'text/plain; charset=%s' % default_charset
+
+options['portal_title'] = ptool.title()
+options['password'] = password
+
+rendered = context.password_email_template(**decode(options, script))
+if isinstance(rendered, unicode):
+ return rendered.encode(default_charset)
+else:
+ return rendered
Copied: CMF/trunk/CMFDefault/skins/zpt_generic/password_email_template.pt (from rev 41621, CMF/trunk/CMFDefault/skins/zpt_generic/member_password_mail_template.pt)
Copied: CMF/trunk/CMFDefault/skins/zpt_generic/registered_email.py (from rev 41624, CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py)
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail.py 2006-02-15 10:18:11 UTC (rev 41624)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/registered_email.py 2006-02-16 09:19:01 UTC (rev 41632)
@@ -0,0 +1,37 @@
+##parameters=member=None, password='baz', email='foo at example.org'
+##
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import decode
+
+atool = getToolByName(script, 'portal_actions')
+ptool = getToolByName(script, 'portal_properties')
+utool = getToolByName(script, 'portal_url')
+default_charset = ptool.getProperty('default_charset')
+portal_url = utool()
+
+
+options = {}
+
+email_from_name = ptool.getProperty('email_from_name')
+email_from_address = ptool.getProperty('email_from_address')
+options['portal_address'] = '%s <%s>' % (email_from_name, email_from_address)
+options['member_address'] = '<%s>' % email
+options['content_type'] = 'text/plain; charset=%s' % default_charset
+
+options['portal_title'] = ptool.title()
+options['portal_description'] = ptool.getProperty('description')
+options['portal_url'] = portal_url
+
+member_id = member and member.getId() or 'foo'
+options['member_id'] = member_id
+options['password'] = password
+
+target = atool.getActionInfo('user/login')['url']
+options['login_url'] = '%s' % target
+options['signature'] = email_from_name
+
+rendered = context.registered_email_template(**decode(options, script))
+if isinstance(rendered, unicode):
+ return rendered.encode(default_charset)
+else:
+ return rendered
Copied: CMF/trunk/CMFDefault/skins/zpt_generic/registered_email_template.pt (from rev 41621, CMF/trunk/CMFDefault/skins/zpt_generic/member_registered_mail_template.pt)
More information about the CMF-checkins
mailing list