[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - password_form.pt:1.3.26.1 personalize_form.pt:1.7.20.1 recent_news.pt:1.5.24.1

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


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

Modified Files:
      Tag: yuppie-collector122-branch
	password_form.pt personalize_form.pt recent_news.pt 
Log Message:
- added i18n attributes
- closed empty tags

=== CMF/CMFDefault/skins/zpt_generic/password_form.pt 1.3 => 1.3.26.1 ===
--- CMF/CMFDefault/skins/zpt_generic/password_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_generic/password_form.pt	Thu Feb 27 19:28:57 2003
@@ -2,48 +2,46 @@
       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 tal:define="member python: here.portal_membership.getAuthenticatedMember()">
 <div class="Desktop">
 
-<h1> Change your Password </h1>
+<h1 i18n:translate="">Change your Password</h1>
 <div class="error"
      tal:replace="request/error"
-     tal:condition="request/error|nothing"><hr></div>
+     tal:condition="request/error|nothing"><hr /></div>
 
 <form action="change_password" method="post"
       tal:attributes="action string:${here/absolute_url}/change_password"
 >
 <table class="FormLayout">
  <tr>
-  <th>Username
-  </th>
+  <th i18n:translate="">Username</th>
   <td><span tal:replace="member/getUserName">You</span>
   </td>
  </tr>
  <tr>
-  <th>New password
-  </th>
-  <td><input type="password" name="password">
+  <th i18n:translate="">New password</th>
+  <td><input type="password" name="password" />
   </td>
  </tr>
  <tr>
-  <th>Confirm new password
-  </th>
-  <td><input type="password" name="confirm">
+  <th i18n:translate="">Confirm new password</th>
+  <td><input type="password" name="confirm" />
   </td>
  </tr>
  <tr>
-  <th>Domains
-  </th>
+  <th i18n:translate="">Domains</th>
   <td>
-    <input type="text" name="domains:tokens" value=""><br>
-    <em> If you do not know what this field is for, leave it blank. </em>
+    <input type="text" name="domains:tokens" value="" /><br />
+    <em i18n:translate="">If you do not know what this field is for, leave it
+    blank.</em>
   </td>
  </tr>
  <tr>
-  <td><br></td>
-  <td><input type="submit" value=" Change ">
+  <td><br /></td>
+  <td>
+   <input type="submit" value=" Change " i18n:attributes="value" />
   </td>
  </tr>
 </table>


=== CMF/CMFDefault/skins/zpt_generic/personalize_form.pt 1.7 => 1.7.20.1 ===
--- CMF/CMFDefault/skins/zpt_generic/personalize_form.pt:1.7	Tue Jul 23 10:47:50 2002
+++ CMF/CMFDefault/skins/zpt_generic/personalize_form.pt	Thu Feb 27 19:28:57 2003
@@ -3,7 +3,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="purl here/portal_url;
                   mtool here/portal_membership;
@@ -22,12 +22,13 @@
 
   <div class="Desktop">
 
-   <h1> Member Preferences </h1>
+   <h1 i18n:translate="">Member Preferences</h1>
 
    <span tal:replace="request/msg"
          tal:condition="request/msg|nothing" />
-      
-   <p><a href="password_form">Click here</a> to change your password.</p>
+
+   <p i18n:translate=""><a href="password_form">Click here</a> to change your
+     password.</p>
 
    <form action="personalize" method="post"
          tal:attributes="action string:${purl}/personalize"
@@ -35,39 +36,40 @@
     <table class="FormLayout">
 
      <tr>
-      <th>Email address</th>
+      <th i18n:translate="">Email address</th>
       <td><input type="text" name="email" value=""
-                 tal:attributes="value member/email|nothing">
+                 tal:attributes="value member/email|nothing" />
       </td>
      </tr>
 
      <tr>
-      <th valign="top">Listed status</th>
+      <th valign="top" i18n:translate="">Listed status</th>
       <td tal:define="listed member/listed|nothing">
-        <input type="radio" name="listed" 
+        <input type="radio" name="listed"
                tal:attributes="checked listed"
                value="on" id="cb_listed" />
-        <label for="cb_listed">Listed</label>
+        <label for="cb_listed" i18n:translate="">Listed</label>
 
         <dl class="FieldHelp">
-          <dd>You will show up on the public membership roster.</dd>
+          <dd i18n:translate="">You will show up on the public membership
+            roster.</dd>
         </dl>
 
-        <input type="radio" name="listed" 
+        <input type="radio" name="listed"
                tal:attributes="checked python:( hasattr(member,'listed')
                                   and not(member.getProperty( 'listed' ) ) )"
                value="" id="cb_unlisted" />
-       <label for="cb_unlisted">Unlisted</label>
+       <label for="cb_unlisted" i18n:translate="">Unlisted</label>
         <dl class="FieldHelp">
-          <dd> You will <i>not</i> show up on the public membership roster.
-               Your Member folder will still be publicly accessible unless
-               you change its security settings.</dd>
+          <dd i18n:translate="">You will <i>not</i> show up on the public
+            membership roster. Your Member folder will still be publicly
+            accessible unless you change its security settings.</dd>
         </dl>
       </td>
      </tr>
 
      <tr tal:condition="here/portal_skins|nothing">
-      <th>Skin</th>
+      <th i18n:translate="">Skin</th>
       <td tal:define="s_tool here/portal_skins;
                       current request/portal_skin|nothing;
                      ">
@@ -84,7 +86,9 @@
 
      <tr>
       <td><br /></td>
-      <td><input type="submit" value=" Change "></td>
+      <td>
+       <input type="submit" value=" Change " i18n:attributes="value" />
+      </td>
      </tr>
     </table>
    </form>


=== CMF/CMFDefault/skins/zpt_generic/recent_news.pt 1.5 => 1.5.24.1 ===
--- CMF/CMFDefault/skins/zpt_generic/recent_news.pt:1.5	Fri Jul  5 15:45:05 2002
+++ CMF/CMFDefault/skins/zpt_generic/recent_news.pt	Thu Feb 27 19:28:57 2003
@@ -2,26 +2,28 @@
       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 tal:define="b_start string:0;b_start request/b_start | b_start;
        newsitems python: here.portal_catalog.searchResults(portal_type='News Item', sort_on='Date', sort_order='reverse', review_state='published');
-	   Batch python:modules['ZTUtils'].Batch;
-	   global batch python:Batch(newsitems, 10, int(b_start), orphan=1)">
+       Batch python:modules['ZTUtils'].Batch;
+       global batch python:Batch(newsitems, 10, int(b_start), orphan=1)">
 
- <p class="Desktop" 
+ <p class="Desktop"
     tal:define="p batch/previous" tal:condition="p">
  <a href=""
-    tal:attributes="href string:?b_start=${p/first}"><span tal:replace="p/length">n</span> more recent articles</a>
+    tal:attributes="href string:?b_start=${p/first}"
+    i18n:translate=""><span tal:replace="p/length"
+                            i18:name="count">n</span> more recent articles</a>
  </p>
 
  <table cellspacing="0" border="0" width="90%"
         tal:repeat="newsitems batch"
-		tal:condition="newsitems">
+        tal:condition="newsitems">
  <tr>
   <td class="NewsListing" align="left" valign="top">
       <a href="" class="NewsListing"
-	     tal:attributes="href newsitems/getURL"
-		 tal:content="newsitems/Title">Title</a>
+         tal:attributes="href newsitems/getURL"
+         tal:content="newsitems/Title">Title</a>
   </td>
   <td class="NewsListing" align="right" valign="top"
       tal:content="newsitems/Date">Date
@@ -34,19 +36,21 @@
  <tr>
   <td colspan="2">
     <em> <span tal:define="pss modules/Products.PythonScripts.standard; niDescription newsitems/Description"
-	           tal:replace="structure python:pss.structured_text(niDescription)">Description</span></em>
+               tal:replace="structure python:pss.structured_text(niDescription)">Description</span></em>
   </td>
  </tr>
   </table>
 <div tal:condition="python:not(newsitems)">
- <p class="Desktop">
+ <p class="Desktop" i18n:translate="">
   No news is good news!
  </p>
 </div>
- <p class="Desktop" 
+ <p class="Desktop"
     tal:define="n batch/next" tal:condition="n">
  <a href=""
-    tal:attributes="href string:?b_start=${batch/end}"><span tal:replace="n/length">n</span> older articles</a>
+    tal:attributes="href string:?b_start=${batch/end}"
+    i18n:translate=""><span tal:replace="n/length"
+                            i18n:name="count">n</span> older articles</a>
  </p>
 </div>
 </div>