[Plone-cvs] r9246 - in CMFPlone/branches/2.1: . skins/plone_forms

[hannosch <svn...@pl...>]

Author: hannosch
Date: Fri Mar  3 15:08:53 2006
New Revision: 9246

Modified:
   CMFPlone/branches/2.1/HISTORY.txt
   CMFPlone/branches/2.1/skins/plone_forms/mail_password_form.pt
Log:
Included e-mail address in mail_password_form into the i18n message. Fixes #5045.

Modified: CMFPlone/branches/2.1/HISTORY.txt
==============================================================================
--- CMFPlone/branches/2.1/HISTORY.txt	(original)
+++ CMFPlone/branches/2.1/HISTORY.txt	Fri Mar  3 15:08:53 2006
@@ -3,6 +3,11 @@
    (name of developer listed in brackets)
 
 Plone 2.1.3 - Tomahawk - Unreleased
+
+    - Included e-mail address in mail_password_form into the i18n message.
+      Fixes http://dev.plone.org/plone/ticket/5045.
+      [hannosch]
+
     - Modified viewThreadsAtBottom to make it better work with css:
       div is not shown when no discussions exist or no discussions
       are allowed. Image icons in front of each reply is now a background

Modified: CMFPlone/branches/2.1/skins/plone_forms/mail_password_form.pt
==============================================================================
--- CMFPlone/branches/2.1/skins/plone_forms/mail_password_form.pt	(original)
+++ CMFPlone/branches/2.1/skins/plone_forms/mail_password_form.pt	Fri Mar  3 15:08:53 2006
@@ -8,12 +8,16 @@
 
     <h1 i18n:translate="heading_lost_password">Lost Password</h1>
 
-    <p><span tal:omit-tag="" i18n:translate="description_lost_password">
-    Enter your user name below, click <strong>Send me my password</strong>, and your password
-    will be mailed to you if you gave a valid e-mail address when you registered.
-    If this will not work for you (for example, if you forgot your user
-    name or didn't enter your e-mail address) send a request to</span>
-    <a tal:replace="structure python: here.spamProtect(portal_properties.email_from_address)" />.
+    <p i18n:translate="description_lost_password">
+        Enter your user name below, click <strong>Send me my password</strong>,
+        and your password will be mailed to you if you gave a valid e-mail
+        address when you registered. If this will not work for you (for example,
+        if you forgot your user name or didn't enter your e-mail address) send a
+        request to
+        <a tal:replace="structure python: here.spamProtect(portal_properties.email_from_address)"
+           i18n:name="email_address">
+            e-mail address
+        </a>.
     </p>
 
     <form name="mail_password" method="post" action="mail_password">