[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - roster.pt:1.3.4.1 search.pt:1.3.38.1 search_form.pt:1.5.24.1 standard_error_message.pt:1.6.18.1
Yvo Schubbe
schubbe@web.de
Thu, 27 Feb 2003 19:29:22 -0500
Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv27736/CMFDefault/skins/zpt_generic
Modified Files:
Tag: yuppie-collector122-branch
roster.pt search.pt search_form.pt standard_error_message.pt
Log Message:
- added i18n attributes
- closed empty tags
=== CMF/CMFDefault/skins/zpt_generic/roster.pt 1.3 => 1.3.4.1 ===
--- CMF/CMFDefault/skins/zpt_generic/roster.pt:1.3 Fri Feb 21 06:39:28 2003
+++ CMF/CMFDefault/skins/zpt_generic/roster.pt Thu Feb 27 19:29:20 2003
@@ -9,9 +9,10 @@
<div class="Desktop"
metal:define-macro="roster"
+ i18n:domain="cmf_default"
>
-<h3> Portal Members </h3>
+<h3 i18n:translate="">Portal Members</h3>
<table class="SearchResults"
tal:define="mtool here/portal_membership;
@@ -19,8 +20,8 @@
mtool.getMembersFolder() )">
<tr>
<td width="16"> <br /> </td>
- <th>Member</th>
- <th tal:condition="isUserManager">Listed?</th>
+ <th i18n:translate="">Member</th>
+ <th tal:condition="isUserManager" i18n:translate="">Listed?</th>
</tr>
<div tal:define="b_start string:0;b_start request/b_start | b_start;
members mtool/getRoster;
@@ -38,7 +39,7 @@
tal:replace="id">ID</span>
</td>
<td tal:condition="isUserManager"
- tal:define="listed members/listed">
+ tal:define="listed members/listed" i18n:translate="">
<span tal:replace="python: listed and 'Yes' or 'No'">Yes...Or No</span>
</td>
</tr>
@@ -46,13 +47,17 @@
<tr>
<td> <br /> </td>
<td>
- <span tal:define="p batch/previous" tal:condition="p">
+ <span tal:define="p batch/previous" tal:condition="p">
<a href=""
- tal:attributes="href string:?b_start=${p/first}">Previous <span tal:replace="p/length">p</span> Members</a>
+ tal:attributes="href string:?b_start=${p/first}"
+ i18n:translate="">Previous <span tal:replace="p/length"
+ i18n:name="count">p</span> Members</a>
</span>
<span tal:define="n batch/next" tal:condition="n">
- <a href=""
- tal:attributes="href string:?b_start=${batch/end}">Next <span tal:replace="n/length">n</span> Members</a>
+ <a href=""
+ tal:attributes="href string:?b_start=${batch/end}"
+ i18n:translate="">Next <span tal:replace="n/length"
+ i18n:name="count">n</span> Members</a>
</span>
</td>
</tr>
=== CMF/CMFDefault/skins/zpt_generic/search.pt 1.3 => 1.3.38.1 ===
--- CMF/CMFDefault/skins/zpt_generic/search.pt:1.3 Fri Jan 4 20:30:19 2002
+++ CMF/CMFDefault/skins/zpt_generic/search.pt Thu Feb 27 19:29:20 2003
@@ -2,30 +2,32 @@
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">
-<h3> Search Results </h3>
+<h3 i18n:translate="">Search Results</h3>
<div tal:define="b_start python:0;b_start request/b_start | b_start;
results python:here.doFormSearch( REQUEST=request );
Batch python:modules['ZTUtils'].Batch;
global batch python:Batch(results, 25, b_start, orphan=1);
">
- <p>Found <span tal:define="pss modules/Products.PythonScripts.standard"
- tal:replace="python:pss.thousands_commas(len(results))">100</span> items
- <span tal:condition="exists: request/SearchableText"
- tal:replace="string:matching ${request/SearchableText}"></span>.
- </p>
+
+<p i18n:translate="">Found
+ <span tal:define="pss modules/Products.PythonScripts.standard"
+ tal:replace="python:pss.thousands_commas(len(results))"
+ i18n:name="count">100</span> items
+ <span tal:condition="exists: request/SearchableText"
+ tal:replace="string:matching ${request/SearchableText}"
+ i18n:name="text"></span>.
+</p>
+
<table class="SearchResults">
<tr>
- <td width="16"><br></td>
- <th> Title
- </th>
- <th> Type
- </th>
- <th> Date
- </th>
+ <td width="16"><br /></td>
+ <th i18n:translate="">Title</th>
+ <th i18n:translate="">Type</th>
+ <th i18n:translate="">Date</th>
</tr>
<tbody tal:repeat="results batch"
tal:condition="results">
@@ -33,16 +35,19 @@
<td tal:define="global objURL python: results.getURL() + '/view'">
<span tal:condition="results/getIcon|nothing">
<a href="" tal:attributes="href objURL"><img src="" border="0" alt="" title=""
- tal:define="alt results/Type"
- tal:attributes="src results/getIcon; alt alt; title alt">
+ tal:define="alt results/Type"
+ tal:attributes="src results/getIcon; alt alt; title alt" />
</a>
</span>
</td>
<td>
- <a href="" tal:attributes="href objURL"><span tal:condition="results/Title"
- tal:content="results/Title">Title</span><span tal:condition="not:results/Title" tal:content="string:(No title)"></span></a>
+ <a href="" tal:attributes="href objURL">
+ <span tal:condition="results/Title"
+ tal:content="results/Title">Title</span>
+ <span tal:condition="not:results/Title"
+ i18n:translate="">(No title)</span></a>
</td>
- <td><span tal:content="results/Type">Type</span></td>
+ <td><span tal:content="results/Type" i18n:translate="">Type</span></td>
<td tal:content="results/Date">Date</td>
</tr>
<tr>
@@ -50,26 +55,28 @@
<td colspan="3">
<em><span tal:condition="results/Description"
tal:content="results/Description">Description</span>
- <span tal:condition="not:results/Description"
- tal:content="string:(No description)"></span></em>
+ <span tal:condition="not:results/Description"
+ i18n:translate="">(No description)</span></em>
</td>
</tr>
</tbody>
- </table>
-<div tal:condition="not:results"
- tal:replace="string:There are no items matching your specified criteria"></div>
+</table>
+<p tal:condition="not:results"
+ i18n:translate="">There are no items matching your specified criteria</p>
<p class="Desktop" tal:define="mq python:modules['ZTUtils'].make_query">
<span tal:define="p batch/previous" tal:condition="p">
<a href=""
tal:attributes="href python: '?' + mq( request.form, b_start=p.first )"
- >Previous <span tal:replace="p/length">n</span> items</a>
+ i18n:translate=""
+ >Previous <span tal:replace="p/length" i18n:name="count">n</span> items</a>
</span>
<span tal:define="n batch/next" tal:condition="n">
<a href=""
tal:attributes="href python: '?' + mq( request.form, b_start=n.first )"
- >Next <span tal:replace="n/length">n</span> items</a>
- </span>
+ i18n:translate=""
+ >Next <span tal:replace="n/length" i18n:name="count">n</span> items</a>
+ </span>
</p>
</div>
</div>
=== CMF/CMFDefault/skins/zpt_generic/search_form.pt 1.5 => 1.5.24.1 ===
--- CMF/CMFDefault/skins/zpt_generic/search_form.pt:1.5 Fri Jul 5 15:45:06 2002
+++ CMF/CMFDefault/skins/zpt_generic/search_form.pt Thu Feb 27 19:29:20 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">
<div class="Desktop">
-<h1>Search <span tal:replace="here/Title" /></h1>
+<h1 i18n:translate="">Search <span tal:replace="here/Title"
+ i18n:name="title" /></h1>
<form action="search"
tal:attributes="action string:${here/portal_url}/search"
@@ -16,31 +17,29 @@
<tr tal:condition="python: here.portal_membership.checkPermission('Review portal content', here)">
- <th> Review Status
- </th>
+ <th i18n:translate="">Review Status</th>
<td>
<select name="review_state" size="3" multiple>
- <option value="" selected>-- any --</option>
- <option>private</option>
- <option>pending</option>
- <option>published</option>
+ <option value="" selected i18n:translate="">-- any --</option>
+ <option value="private" i18n:translate="">private</option>
+ <option value="pending" i18n:translate="">pending</option>
+ <option value="published" i18n:translate="">published</option>
</select>
<dl class="FieldHelp">
- <dd> As a reviewer, you may search for items based on their
- review state. If you wish to constrain results to items
- in certain states, select them from this list.
+ <dd i18n:translate="">As a reviewer, you may search for items based on
+ their review state. If you wish to constrain results to items in
+ certain states, select them from this list.
</dd>
</dl>
</td>
</tr>
-
+
<tr valign="top">
- <th> Full Text
- </th>
+ <th i18n:translate="">Full Text</th>
<td>
- <input name="SearchableText" size="40">
+ <input name="SearchableText" size="40" />
<dl class="FieldHelp">
- <dd> For a simple text search, enter your search term
+ <dd i18n:translate="">For a simple text search, enter your search term
here. Multiple words may be found by combining
them with <b>AND</b> and <b>OR</b>. This will
find text in items' contents, title and
@@ -51,18 +50,17 @@
</tr>
<tr>
- <th>Title
- </th>
+ <th i18n:translate="">Title</th>
<td>
- <input name="Title" size="20">
+ <input name="Title" size="20" />
</td>
</tr>
<tr valign="top">
- <th>Subject</th>
+ <th i18n:translate="">Subject</th>
<td tal:define="items python: here.portal_catalog.uniqueValuesFor('Subject')">
<select name="Subject:list" multiple size="5">
- <option value="" selected>-- any --</option>
+ <option value="" selected i18n:translate="">-- any --</option>
<option value=""
tal:repeat="item items"
tal:attributes="value item"
@@ -73,12 +71,11 @@
</tr>
<tr>
- <th> Description
- </th>
+ <th i18n:translate="">Description</th>
<td>
- <input name="Description" size="20">
+ <input name="Description" size="20" />
<dl class="FieldHelp">
- <dd> You may also search the items' descriptions and
+ <dd i18n:translate=""> You may also search the items' descriptions and
titles specifically. Multiple words may be found
by combining them with <b>AND</b> and <b>OR</b>.
</dd>
@@ -87,8 +84,7 @@
</tr>
<tr>
- <th> Find new items since...
- </th>
+ <th i18n:translate="">Find new items since...</th>
<td tal:define="today python: here.ZopeTime().earliestTime();
mtool here/portal_membership;
member python:mtool.getAuthenticatedMember();
@@ -98,38 +94,44 @@
lastMth python:(today-31).Date();
">
<select name="created:date">
- <option value="1970/01/01 00:00:00 GMT">Ever</option>
- <option value=""
- tal:condition="python:not(here.portal_membership.isAnonymousUser())"
- tal:attributes="value lastLogin">Last login</option>
+ <option value="1970/01/01 00:00:00 GMT"
+ i18n:translate="">Ever</option>
+ <option value=""
+ tal:condition="python:not(here.portal_membership.isAnonymousUser())"
+ tal:attributes="value lastLogin"
+ i18n:translate="">Last login</option>
<option value=""
- tal:attributes="value yesterday">Yesterday</option>
+ tal:attributes="value yesterday"
+ i18n:translate="">Yesterday</option>
<option value=""
- tal:attributes="value lastWeek">Last week</option>
+ tal:attributes="value lastWeek"
+ i18n:translate="">Last week</option>
<option value=""
- tal:attributes="value lastMth">Last month</option>
+ tal:attributes="value lastMth"
+ i18n:translate="">Last month</option>
</select>
- <input type="hidden" name="created_usage" value="range:min">
+ <input type="hidden" name="created_usage" value="range:min" />
<dl class="FieldHelp">
- <dd> You may find only recent items by selecting a time-frame.
+ <dd i18n:translate="">You may find only recent items by selecting a
+ time-frame.
</dd>
</dl>
</td>
</tr>
<tr>
- <th> Item type
- </th>
+ <th i18n:translate="">Item type</th>
<td tal:define="typeinfos here/portal_types/listTypeInfo" >
<select name="portal_type:list" multiple size="5">
- <option value="" selected>-- any --</option>
+ <option value="" selected i18n:translate="">-- any --</option>
<option value=""
- tal:repeat="typeinfo typeinfos"
- tal:attributes="value typeinfo/getId"
- tal:content="typeinfo/Title"></option>
- </select>
+ tal:repeat="typeinfo typeinfos"
+ tal:attributes="value typeinfo/getId"
+ tal:content="typeinfo/Title"
+ i18n:translate=""></option>
+ </select>
<dl class="FieldHelp">
- <dd> You may limit your results to particular kinds of
+ <dd i18n:translate="">You may limit your results to particular kinds of
items by selecting them above. To find all kinds
of items, do not select anything.
</dd>
@@ -138,13 +140,12 @@
</tr>
<tr>
- <th> Creator
- </th>
+ <th i18n:translate="">Creator</th>
<td>
- <input name="Creator" size="20">
+ <input name="Creator" size="20" />
<dl class="FieldHelp">
- <dd> To find items by a particular user only, enter
+ <dd i18n:translate="">To find items by a particular user only, enter
their username above. Note that you must enter
their username <i>exactly</i>.
</dd>
@@ -153,9 +154,9 @@
</tr>
<tr>
- <td><br></td>
+ <td><br /></td>
<td>
- <input type="submit" value="Search">
+ <input type="submit" value=" Search " i18n:attributes="value" />
</td>
</tr>
</table>
=== CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt 1.6 => 1.6.18.1 ===
--- CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt:1.6 Thu Aug 1 15:57:45 2002
+++ CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt Thu Feb 27 19:29:20 2003
@@ -2,56 +2,63 @@
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">
-
+
<div tal:condition="options/error_message"
tal:content="structure options/error_message" />
<div tal:condition="not: options/error_message">
- <h2>Site Error</h2>
+ <h2 i18n:translate="">Site Error</h2>
+
+ <p i18n:translate="">An error was encountered while publishing this
+ resource.</p>
- <p>An error was encountered while publishing this resource.</p>
-
- <p> <strong>Error Type:
- <span tal:replace="options/error_type" />
- </strong>
- <br><strong>Error Value:
- <span tal:replace="options/error_value" /></strong>
- <br>
+ <p>
+ <strong i18n:translate="">Error Type:
+ <span tal:replace="options/error_type" i18n:name="error_type" />
+ </strong>
+ <br />
+ <strong i18n:translate="">Error Value:
+ <span tal:replace="options/error_value" i18n:name="error_value" />
+ </strong>
+ <br />
</p>
-
+
<hr noshade />
-
- <p>Troubleshooting Suggestions</p>
+
+ <p i18n:translate="">Troubleshooting Suggestions</p>
<ul>
<div tal:condition="python: options['error_type'] in ('KeyError'
,'NameError')">
- <li>This resource may be trying to reference a
+ <li i18n:translate="">This resource may be trying to reference a
nonexistent object or variable
- <strong><span tal:replace="options/error_value" /></strong>.</li>
+ <strong><span tal:replace="options/error_value"
+ i18n:name="error_value" /></strong>.</li>
</div>
- <li>The URL may be incorrect.</li>
- <li>The parameters passed to this resource may be incorrect.</li>
- <li>A resource that this resource relies on may be encountering
- an error.</li>
+ <li i18n:translate="">The URL may be incorrect.</li>
+ <li i18n:translate="">The parameters passed to this resource may be
+ incorrect.</li>
+ <li i18n:translate="">A resource that this resource relies on may be
+ encountering an error.</li>
</ul>
- <p>For more detailed information about the error, please
+ <p i18n:translate="">For more detailed information about the error, please
refer to the HTML source for this page.
</p>
- <p>If the error persists please contact the site maintainer.
- Thank you for your patience.
+ <p i18n:translate="">If the error persists please contact the site
+ maintainer. Thank you for your patience.
</p>
</div>
<div tal:condition="options/error_log_url | nothing">
<hr noshade />
- <a href="error_log_url" tal:attributes="href options/error_log_url">
+ <a href="error_log_url" tal:attributes="href options/error_log_url"
+ i18n:translate="">
Show Error Log Entry
</a>
</div>