From: hannosch <svn...@pl...> - 2006-09-28 23:58:41
|
Author: hannosch Date: Thu Sep 28 23:58:38 2006 New Revision: 11012 Modified: CMFPlone/branches/2.5/skins/plone_login/join_form.cpt CMFPlone/branches/2.5/skins/plone_login/registered.pt Log: Fixed some i18n markup problems of the last commits. Modified: CMFPlone/branches/2.5/skins/plone_login/join_form.cpt ============================================================================== --- CMFPlone/branches/2.5/skins/plone_login/join_form.cpt (original) +++ CMFPlone/branches/2.5/skins/plone_login/join_form.cpt Thu Sep 28 23:58:38 2006 @@ -23,7 +23,9 @@ <fieldset> - <legend i18n:translate="legend_personal_details">Personal Details</legend> + <legend i18n:translate="legend_personal_details"> + Personal Details + </legend> <input type="hidden" name="came_from" value="" tal:condition="request/came_from|nothing" @@ -204,7 +206,7 @@ <div class="field" tal:condition="allowEnterPassword"> - <div class="formHelp" i18n:translate="label_password_will_be_mailed"> + <div class="formHelp" i18n:translate="label_password_change_mail"> A URL will be generated and e-mailed to you; follow the link to reach a page where you can change your password and complete the registration process. @@ -230,4 +232,3 @@ </body> </html> - Modified: CMFPlone/branches/2.5/skins/plone_login/registered.pt ============================================================================== --- CMFPlone/branches/2.5/skins/plone_login/registered.pt (original) +++ CMFPlone/branches/2.5/skins/plone_login/registered.pt Thu Sep 28 23:58:38 2006 @@ -14,24 +14,29 @@ <div tal:define="ve portal/validate_email" tal:condition="python: auth"> -<h1 i18n:translate="heading_welcome">Welcome!</h1> +<h1 i18n:translate="heading_welcome"> + Welcome! +</h1> -<p i18n:translate="description_you_are_registered">You have been registered.</p> +<p i18n:translate="description_you_are_registered"> + You have been registered. +</p> <p tal:condition="ve" tal:define="expire_length portal/portal_password_reset/getExpirationTimeout" - i18n:translate="description_you_will_get_password"> - You will receive an e-mail shortly containing a URL that will - allow you to set your password. When you receive this e-mail, - please follow the link to complete your registration process. - NOTE: The password reset URL will expire in - <span tal:replace="expire_length" /> hours. If your password - reset request expires, you may use the "Forgot your password" link + i18n:translate="description_password_reset_or_registered"> + You will receive an e-mail shortly containing a URL that will allow you to + set your password. When you receive this e-mail, please follow the link to + complete your registration process. NOTE: The password reset URL will expire + in <span tal:replace="expire_length" i18n:name="time"/> hours. If your + password reset request expires, you may use the "Forgot your password" link to generate another password reset request. </p> <tal:block condition="python:not(ve)"> - <p i18n:translate="description_you_can_log_on_now">Click the button to log in immediately.</p> + <p i18n:translate="description_you_can_log_on_now"> + Click the button to log in immediately. + </p> <div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none"> Cookies are not enabled. You must <span i18n:name="enable_cookies"> |