[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - join_form.pt:1.4.26.1 logged_in.pt:1.5.20.1 logged_out.pt:1.2.54.1

Yvo Schubbe schubbe@web.de
Thu, 27 Feb 2003 19:28:23 -0500


Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv27366/CMFDefault/skins/zpt_generic

Modified Files:
      Tag: yuppie-collector122-branch
	join_form.pt logged_in.pt logged_out.pt 
Log Message:
- added i18n attributes
- closed empty tags

=== CMF/CMFDefault/skins/zpt_generic/join_form.pt 1.4 => 1.4.26.1 ===
--- CMF/CMFDefault/skins/zpt_generic/join_form.pt:1.4	Sat May  4 16:35:40 2002
+++ CMF/CMFDefault/skins/zpt_generic/join_form.pt	Thu Feb 27 19:28:21 2003
@@ -2,99 +2,102 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop"
      tal:define="mtool here/portal_membership;
                  member mtool/getAuthenticatedMember;
                  ptool here/portal_properties;
                 ">
 
-<h1>Become a member</h1>
+<h1 i18n:translate="">Become a member</h1>
 
 <div tal:define="registered python:member.has_role('Member')">
 
  <div tal:condition="registered">
 
-  <p> You are already a member. You may use the
-      <a href="personalize_form">personalization form</a> 
+  <p i18n:translate=""> You are already a member. You may use the
+      <a href="personalize_form">personalization form</a>
        to change your membership information. </p>
 
  </div><!-- registered -->
 
  <div tal:condition="not: registered">
 
-  <p> Becoming a member gives you the ability to personalize the site
-      and participate in the community.</p>
+  <p i18n:translate="">Becoming a member gives you the ability to personalize
+    the site and participate in the community.</p>
 
-  <p> It does not cost any money to become a member and your email and
-      other personal information will remain private.</p>
+  <p i18n:translate="">It does not cost any money to become a member and your
+    email and other personal information will remain private.</p>
 
-  <p tal:condition="python: ptool.validate_email">
+  <p tal:condition="python: ptool.validate_email" i18n:translate="">
       You must submit a valid email address. This address will be used
       to send you a randomly-generated password.  Once you have logged
       in with this password, you may change it to anything you like.</p>
 
   <div class="DesktopStatusBar"
        tal:content="request/error|nothing">
-     <hr>
+     <hr />
   </div>
 
-  <form action="register" method="POST"
+  <form action="register" method="post"
         tal:attributes="action string:${here/portal_url}/register"
   >
 
    <input type="hidden" name="last_visit:date" value=""
-          tal:attributes="value here/ZopeTime">
+          tal:attributes="value here/ZopeTime" />
    <input type="hidden" name="prev_visit:date" value=""
-          tal:attributes="value here/ZopeTime">
+          tal:attributes="value here/ZopeTime" />
 
    <table class="FormLayout">
 
     <tr>
-     <th> Login Name </th>
+     <th i18n:translate="">Login Name</th>
      <td>
       <input type="text" name="username" size="30" value=""
-             tal:attributes="value request/username|nothing">
+             tal:attributes="value request/username|nothing" />
      </td>
     </tr>
 
     <tr>
-     <th> Email Address </th>
+     <th i18n:translate="">Email Address</th>
      <td align="left" valign="top">
       <input type="text" name="email" size="30" value=""
-          tal:attributes="value request/email|nothing">
+          tal:attributes="value request/email|nothing" />
      </td>
     </tr>
 
    <tbody tal:condition="python: not(ptool.validate_email)">
 
     <tr>
-     <th> Password </th>
+     <th i18n:translate="">Password</th>
      <td align="left" valign="top">
-      <input type="password" name="password" size="30">
+      <input type="password" name="password" size="30" />
      </td>
     </tr>
 
     <tr>
-     <th> Password (confirm) </th>
+     <th i18n:translate="">Password (confirm)</th>
      <td align="left" valign="top">
-      <input type="password" name="confirm" size="30">
+      <input type="password" name="confirm" size="30" />
      </td>
     </tr>
 
     <tr>
-     <th> Mail Password?  </th>
+     <th i18n:translate="">Mail Password?</th>
      <td>
       <input type="checkbox" name="mail_me" size="30" id="cb_mailme" />
-      <em><label for="cb_mailme">Check this box to have your password 
-                                 mailed to you.</label></em>
+      <em><label for="cb_mailme" i18n:translate="">Check this box to have your
+        password mailed to you.</label></em>
      </td>
     </tr>
    </tbody>
 
     <tr>
-     <td><br></td>
-     <td> <input type="submit" name="submit" value="Register"> </td>
+     <td><br /></td>
+     <td>
+      <input type="submit" name="submit" value="Register"
+             i18n:attributes="value" />
+     </td>
     </tr>
 
    </table>


=== CMF/CMFDefault/skins/zpt_generic/logged_in.pt 1.5 => 1.5.20.1 ===
--- CMF/CMFDefault/skins/zpt_generic/logged_in.pt:1.5	Sun Jul 14 18:45:07 2002
+++ CMF/CMFDefault/skins/zpt_generic/logged_in.pt	Thu Feb 27 19:28:21 2003
@@ -8,7 +8,7 @@
       metal:use-macro="here/main_template/macros/master">
 <body>
 
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 
  <div tal:define="p_props here/portal_properties;
                   p_url here/portal_url;
@@ -26,14 +26,15 @@
                                                                   , path='/')"
    />
 
-   <h1 class="DesktopTitle">Login failure</h1>
+   <h1 class="DesktopTitle" i18n:translate="">Login failure</h1>
 
-   <p class="Desktop">You are not currently logged in.  Your username
-      and or password may be incorrect.  Your browser may also not be
-      configured to accept HTTP cookies.  If you need help please contact 
+   <p class="Desktop" i18n:translate="">You are not currently logged in. Your
+     username and or password may be incorrect. Your browser may also not be
+     configured to accept HTTP cookies. If you need help please contact
       <a href="mailto:admin@here.com" title="Email Admin"
          tal:attributes="href string:mailto:${p_props/email_from_address}"
-         tal:content="p_props/email_from_address">Email Admin</a>.
+         tal:content="p_props/email_from_address"
+         i18n:name="admin_email">Email Admin</a>.
    </p>
   </div><!-- isAnon -->
 
@@ -41,54 +42,57 @@
        tal:define="first_time python:(
                     member.getProperty( 'login_time', None ) == never
                                        and p_props.validate_email )">
-  
+
 
    <div tal:condition="first_time">
     <div tal:define="dum_reg python:member.setProperties(
                                                 last_login_time=now,
                                                 login_time=now)" />
 
-    <h1 class="DesktopTitle">Welcome!</h1>
+    <h1 class="DesktopTitle" i18n:translate="">Welcome!</h1>
 
-    <p class="Desktop">
+    <p class="Desktop" i18n:translate="">
        This is the first time that you've logged in to
-       <span replace="p_props/title">Here</span>. 
-       Before you start exploring you need to change your original password. 
+       <span replace="p_props/title" i18n:name="portal_title">Here</span>.
+       Before you start exploring you need to change your original password.
        This will ensure that the password we sent you via email cannot be
        used in a malicious manner.</p>
 
-    <p class="Desktop">
+    <p class="Desktop" i18n:translate="">
        Please use the form below to change your password.</p>
 
     <form action="change_password" method="post"
           tal:attributes="action string:${p_url}/change_password"
     >
      <input type="hidden" name="user" value=""
-            tal:attributes="value member">
-     <input type="hidden" name="domains:tokens" value="">
+            tal:attributes="value member" />
+     <input type="hidden" name="domains:tokens" value="" />
      <input type="hidden" name="redirect" value=""
-            tal:attributes="value string:${p_url}/">
+            tal:attributes="value string:${p_url}/" />
 
      <table>
 
       <tr valign="top" align="left">
-       <th>Username</th>
+       <th i18n:translate="">Username</th>
        <td><span tal:replace="member">You</span></td>
       </tr>
 
       <tr valign="top"  align="left">
-       <th>New password</th>
-       <td><input type="password" name="password"></td>
+       <th i18n:translate="">New password</th>
+       <td><input type="password" name="password" /></td>
       </tr>
 
       <tr valign="top"  align="left">
-       <th>Confirm new password</th>
-       <td><input type="password" name="confirm"></td>
+       <th i18n:translate="">Confirm new password</th>
+       <td><input type="password" name="confirm" /></td>
       </tr>
 
       <tr>
        <td><br /></td>
-       <td><input type="submit" value="Change password"></td>
+       <td>
+        <input type="submit" value="Change password"
+               i18n:attributes="value" />
+       </td>
       </tr>
 
      </table>
@@ -100,7 +104,7 @@
    <div tal:condition="not: first_time">
 
     <div tal:define="d_reg python:member.setProperties(
-                                            last_login_time=member.login_time); 
+                                           last_login_time=member.login_time);
                      ereg python:member.setProperties(
                                             login_time=here.ZopeTime());
                     " />
@@ -112,9 +116,10 @@
                       " />
     </div>
 
-    <h1 class="DesktopTitle">Login success</h1>
+    <h1 class="DesktopTitle" i18n:translate="">Login success</h1>
 
-    <p class="Desktop">Welcome. You are currently logged in. </p>
+    <p class="Desktop" i18n:translate="">Welcome. You are currently logged
+      in.</p>
 
    </div><!-- not first_time -->
 


=== CMF/CMFDefault/skins/zpt_generic/logged_out.pt 1.2 => 1.2.54.1 ===
--- CMF/CMFDefault/skins/zpt_generic/logged_out.pt:1.2	Thu Dec  6 17:43:43 2001
+++ CMF/CMFDefault/skins/zpt_generic/logged_out.pt	Thu Feb 27 19:28:21 2003
@@ -2,11 +2,12 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 <p tal:condition="python: here.portal_membership.isAnonymousUser()"
-   tal:content="string:You have been logged out."></p>
-<p tal:condition="python: not(here.portal_membership.isAnonymousUser())">
-You are logged in outside the portal.  You may need to
+   tal:content="string:You have been logged out."
+   i18n:translate=""></p>
+<p tal:condition="python: not(here.portal_membership.isAnonymousUser())"
+   i18n:translate="">You are logged in outside the portal. You may need to
 <a href="/manage_zmi_logout">log out of the Zope management interface</a>.
 </p>
 </div>