[CMF-checkins] SVN: CMF/trunk/CMFDefault/skins/zpt_ - fixed some i18n issues

Wed Jan 18 06:31:07 EST 2006

Log message for revision 41354:
  - fixed some i18n issues
  - related cleanup

Changed:
  U   CMF/trunk/CMFDefault/skins/zpt_control/finish_portal_construction.pt
  U   CMF/trunk/CMFDefault/skins/zpt_generic/recent_news.pt
  U   CMF/trunk/CMFDefault/skins/zpt_generic/search.py

-=-
Modified: CMF/trunk/CMFDefault/skins/zpt_control/finish_portal_construction.pt
===================================================================

--- CMF/trunk/CMFDefault/skins/zpt_control/finish_portal_construction.pt	2006-01-18 11:05:35 UTC (rev 41353)
+++ CMF/trunk/CMFDefault/skins/zpt_control/finish_portal_construction.pt	2006-01-18 11:31:07 UTC (rev 41354)
@@ -1,24 +1,27 @@
-<html metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
 <body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
 
+<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<h1 i18n:translate="">Welcome to the CMF!</h1>
+</metal:slot>
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
 
-<h3 i18n:translate="">Welcome to the CMF!</h3>
+<p i18n:translate="">The first thing you should do is visit the
+ <i18n:span i18n:name="reconfig_link"><a href="http://cmf.zope.org"
+    tal:attributes="href string:${context/portal_url}/reconfig_form"
+    i18n:translate="">basic configuration form</a></i18n:span>.</p>
+<p i18n:translate="">Then visit the
+ <i18n:span i18n:name="manage_link"><a href="/manage"
+    tal:attributes="href string:${context/portal_url}/manage"
+    i18n:translate="">management interface</a></i18n:span> and the
+ <i18n:span i18n:name="home_link"><a href="/"
+    tal:attributes="href string:${context/portal_url}"
+    i18n:translate="">home page</a></i18n:span>.</p>
 
-<p i18n:translate=""> The first thing you should do is visit the
- <a href="http://cmf.zope.org"
-    tal:attributes="href string:${here/portal_url}/reconfig_form"
- >basic configuration form</a>.
-<br />
- Then visit the
-  <a href="/manage"
-     tal:attributes="href string:${here/portal_url}/manage"
-  >management interface</a> and the
-  <a href="/"
-     tal:attributes="href string:${here/portal_url}/">home page</a>.
-</p>
 </div>
-</div>
+</metal:slot>
+
 </body>
 </html>

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/recent_news.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/recent_news.pt	2006-01-18 11:05:35 UTC (rev 41353)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/recent_news.pt	2006-01-18 11:31:07 UTC (rev 41354)
@@ -1,19 +1,17 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
 <body>
-<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');
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
+<div class="Desktop" tal:define="b_start string:0;b_start request/b_start | b_start;
+       newsitems python: context.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)">
 
- <p class="Desktop"
-    tal:define="p batch/previous" tal:condition="p">
+ <p tal:define="p batch/previous" tal:condition="p">
  <a href=""
     tal:attributes="href string:?b_start=${p/first}"
     i18n:translate=""><span tal:replace="p/length"
-                            i18:name="count">n</span> more recent articles</a>
+                            i18n:name="count">n</span> more recent articles</a>
  </p>
 
  <table cellspacing="0" border="0" width="90%"
@@ -49,19 +47,18 @@
   </td>
  </tr>
  </table>
-<div tal:condition="python:not(newsitems)">
- <p class="Desktop" i18n:translate="">
-  No news is good news!
- </p>
-</div>
- <p class="Desktop"
-    tal:define="n batch/next" tal:condition="n">
+ <div tal:condition="python:not(newsitems)">
+  <p i18n:translate="">No news is good news!</p>
+ </div>
+ <p tal:define="n batch/next" tal:condition="n">
  <a href=""
     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>
+</metal:slot>
+
 </body>
 </html>

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/search.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/search.py	2006-01-18 11:05:35 UTC (rev 41353)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/search.py	2006-01-18 11:31:07 UTC (rev 41354)
@@ -3,6 +3,7 @@
 from Products.PythonScripts.standard import thousands_commas
 from ZTUtils import Batch
 from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.utils import Message as _
 
 ctool = getToolByName(script, 'portal_catalog')
 utool = getToolByName(script, 'portal_url')
@@ -33,7 +34,7 @@
 batch_obj = Batch(items, 25, b_start, orphan=1)
 length = batch_obj.sequence_length
 summary = { 'length': length and thousands_commas(length) or '',
-            'type': (length == 1) and 'item' or 'items',
+            'type': (length == 1) and _('item') or _('items'),
             'match': kw.get('SearchableText') }
 navigation = context.getBatchNavigation(batch_obj, target, **kw)
 options['batch'] = { 'summary': summary,

