[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam - configure.zcml:1.16 dialog_macros.pt:1.8 simpleeditingrow.pt:1.4 template.pt:1.41 view_macros.pt:1.3

Stephan Richter srichter at cosmos.phy.tufts.edu
Wed Aug 6 11:42:34 EDT 2003


Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv17028/app/browser/skins/rotterdam

Modified Files:
	configure.zcml dialog_macros.pt simpleeditingrow.pt 
	template.pt view_macros.pt 
Log Message:
Internationalized a whole bunch templates and screens. I also took the 
oppurtunity to clean some old code up. 

I noticed that particularly the basic Content Objects are in bad shape.

There is still a lot left to do!


=== Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml 1.15 => 1.16 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml:1.15	Sun Aug  3 13:49:59 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/configure.zcml	Wed Aug  6 10:41:54 2003
@@ -1,91 +1,89 @@
 <configure
-    xmlns='http://namespaces.zope.org/zope'
-    xmlns:browser='http://namespaces.zope.org/browser'
-    i18n_domain='zope'
-    >
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
 
-<browser:skin
-    name="Rotterdam" layers="rotterdam default" />
-
-<browser:resource 
-    name="zope3.css" file="zope3.css" layer="rotterdam" />
-
-<browser:resource 
-    name="xmltree.js" file="xmltree.js" layer="rotterdam" />
-
-<browser:resource 
-    name="onlinehelp.js" file="onlinehelp.js" layer="rotterdam" />
-    
- <browser:resource
-    name="favicon.png" file="favicon.png" layer="rotterdam" />
-
-<browser:resource
-    name="zope3logo.gif" file="zope3logo.gif" layer="rotterdam" />
-
-<browser:resource
-    name="logo.gif" file="logo.gif" layer="rotterdam" />
-
-<browser:resource 
-    name="pl.gif" file="pl.gif" layer="rotterdam" />
-
-<browser:resource 
-    name="mi.gif" file="mi.gif" layer="rotterdam" />
-
-<browser:pages
-    for="zope.app.interfaces.container.IReadContainer"
-    permission="zope.View"
-    class=".xmlobject.ReadContainerXmlObjectView">
-  <browser:page name="children.xml" attribute="children" />
-  <browser:page name="singleBranchTree.xml" attribute="singleBranchTree" />
-</browser:pages>
-
-<browser:page
-    name="singleBranchTree.xml" 
-    for="zope.interface.interface.Interface"
-    permission="zope.View"
-    class=".xmlobject.XmlObjectView"
-    attribute="singleBranchTree" 
-    />
-
-<!-- below overrides the standard_macros by Rotterdam Skin -->
-<browser:page
-    for="*"
-    name="standard_macros"
-    permission="zope.View"
-    class=".standardmacros.StandardMacros"
-    layer="rotterdam"
-    allowed_interface="zope.interface.common.mapping.IItemMapping" 
-    />
-
-<browser:page 
-    for="*"
-    name="skin_macros"
-    permission="zope.View"
-    layer="rotterdam"
-    template="template.pt" 
-    />
-
-<browser:page 
-    for="*"
-    name="view_macros"
-    permission="zope.View"
-    layer="rotterdam"
-    template="view_macros.pt" />
-
-<browser:page
-    for="*"
-    name="dialog_macros"
-    permission="zope.View"
-    layer="rotterdam"
-    template="dialog_macros.pt" />
-
-<browser:page
-    permission="zope.Public"
-    allowed_interface="zope.app.interfaces.browser.form.IBrowserWidget"
-    for="zope.schema.interfaces.ISourceText"
-    name="edit"
-    layer="rotterdam"
-    class="zope.app.browser.skins.rotterdam.editingwidgets.SimpleEditingWidget" 
-    />
+  <browser:skin
+      name="Rotterdam" layers="rotterdam default" />
+  
+  <browser:resource 
+      name="zope3.css" file="zope3.css" layer="rotterdam" />
+  
+  <browser:resource 
+      name="xmltree.js" file="xmltree.js" layer="rotterdam" />
+  
+  <browser:resource 
+      name="onlinehelp.js" file="onlinehelp.js" layer="rotterdam" />
+      
+   <browser:resource
+      name="favicon.png" file="favicon.png" layer="rotterdam" />
+  
+  <browser:resource
+      name="zope3logo.gif" file="zope3logo.gif" layer="rotterdam" />
+  
+  <browser:resource
+      name="logo.gif" file="logo.gif" layer="rotterdam" />
+  
+  <browser:resource 
+      name="pl.gif" file="pl.gif" layer="rotterdam" />
+  
+  <browser:resource 
+      name="mi.gif" file="mi.gif" layer="rotterdam" />
+  
+  <browser:pages
+      for="zope.app.interfaces.container.IReadContainer"
+      permission="zope.View"
+      class=".xmlobject.ReadContainerXmlObjectView">
+    <browser:page name="children.xml" attribute="children" />
+    <browser:page name="singleBranchTree.xml" attribute="singleBranchTree" />
+  </browser:pages>
+  
+  <browser:page
+      name="singleBranchTree.xml" 
+      for="zope.interface.interface.Interface"
+      permission="zope.View"
+      class=".xmlobject.XmlObjectView"
+      attribute="singleBranchTree" 
+      />
+  
+  <!-- below overrides the standard_macros by Rotterdam Skin -->
+  <browser:page
+      for="*"
+      name="standard_macros"
+      permission="zope.View"
+      class=".standardmacros.StandardMacros"
+      layer="rotterdam"
+      allowed_interface="zope.interface.common.mapping.IItemMapping" 
+      />
+  
+  <browser:page 
+      for="*"
+      name="skin_macros"
+      permission="zope.View"
+      layer="rotterdam"
+      template="template.pt" 
+      />
+  
+  <browser:page 
+      for="*"
+      name="view_macros"
+      permission="zope.View"
+      layer="rotterdam"
+      template="view_macros.pt" />
+  
+  <browser:page
+      for="*"
+      name="dialog_macros"
+      permission="zope.View"
+      layer="rotterdam"
+      template="dialog_macros.pt" />
+  
+  <browser:page
+      permission="zope.Public"
+      allowed_interface="zope.app.interfaces.browser.form.IBrowserWidget"
+      for="zope.schema.interfaces.ISourceText"
+      name="edit"
+      layer="rotterdam"
+      class=".editingwidgets.SimpleEditingWidget" 
+      />
 
 </configure>


=== Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt 1.7 => 1.8 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt:1.7	Mon Apr 28 12:41:06 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt	Wed Aug  6 10:41:54 2003
@@ -3,11 +3,12 @@
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xml:lang="en"
-  lang="en" >
+  lang="en" 
+  i18n:domain="zope">
 
   <head>
     <!-- Waaa -->
-    <title metal:define-slot="title">Z3 UI</title>
+    <title metal:define-slot="title" i18n:translate="">Z3 UI</title>
 
 
     <style type="text/css" 
@@ -47,13 +48,13 @@
     <div id="personal">
 
       <metal:block define-macro="logged_user">
-        User:
+        <span tal:omit-tag="" i18n:translate="">User:</span>
         <tal:block replace="request/user/getTitle">
           User
         </tal:block>
       </metal:block>
 
-      (Personal elements)
+      <!-- (Personal elements) -->
     </div>
 
 
@@ -62,7 +63,7 @@
 <!--
       <div class="box" id="navigationTree">
 
-        <h4>Navigation</h4>
+        <h4 i18n:translate="">Navigation</h4>
 
         <div 
           xmlns="http://www.zope.org/zope3xmltree"
@@ -131,7 +132,7 @@
 
       <div class="box" id="itemHelp" tal:condition="pagetip|nothing">
 
-        <h4>Tip</h4>
+        <h4 i18n:translate="">Tip</h4>
 
         <div class="body">
 
@@ -155,7 +156,8 @@
 
 
     <div id="footer"
-      metal:define-macro="footer">
+      metal:define-macro="footer"
+      i18n:translate="">
       Powered by Zope
     </div>
 


=== Zope3/src/zope/app/browser/skins/rotterdam/simpleeditingrow.pt 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/simpleeditingrow.pt:1.3	Mon Jun 30 13:10:57 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/simpleeditingrow.pt	Wed Aug  6 10:41:54 2003
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>Extended Editor</title>
+  <title i18n:translate="">Extended Editor</title>
 </head>
 <body>
 <metal:define define-macro="widget">
@@ -22,7 +22,8 @@
 }
 </script>
 <label for="source-text" tal:attributes="for view/name" 
-       tal:content="view/title">Some Source</label>
+       tal:content="view/title"
+       i18n:translate="">Some Source</label>
 <div class="field">
 
 


=== Zope3/src/zope/app/browser/skins/rotterdam/template.pt 1.40 => 1.41 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/template.pt:1.40	Thu Jul 31 23:21:33 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/template.pt	Wed Aug  6 10:41:54 2003
@@ -2,10 +2,11 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"
     xml:lang="en"
-    lang="en">
+    lang="en"
+    i18n:domain="zope">
 
   <head>
-    <title metal:define-slot="title">Z3 UI</title>
+    <title metal:define-slot="title" i18n:translate="">Z3 UI</title>
 
 
     <style type="text/css"
@@ -23,13 +24,12 @@
     <metal:block define-slot="style_slot" />
     <metal:block define-slot="ecmascript_slot" />
 
-    <!-- Ugly is better than lobotomized.
-    -->
+    <!-- Ugly is better than lobotomized. -->
     <script type="text/javascript" src="xmltree.js"
             tal:attributes="src string:${context/++resource++xmltree.js}" >
     </script>
 
-    <!-- Popup script for the OnlineHelp -->
+    <!-- Popup sript for the OnlineHelp -->
     <script type="text/javascript" src="onlinehelp.js"
             tal:attributes="src string:${context/++resource++onlinehelp.js}" >
     </script>
@@ -47,18 +47,20 @@
     <div id="global">
       <div id="userDetails">
         <metal:block define-macro="logged_user">
-          User:
+          <span tal:omit-tag="" i18n:translate="">User:</span>
           <tal:block replace="request/user/getTitle">
             User
           </tal:block>
         </metal:block>
           <a href="" 
             tal:attributes="href string:@@logout.html?nextURL=${request/URL}"
-            tal:condition="python: hasattr(view.request.user, 'getLogin')">
+            tal:condition="python: hasattr(view.request.user, 'getLogin')"
+            i18n:translate="">
             [Logout]</a>
           <a href="" 
             tal:attributes="href string:@@login.html?nextURL=${request/URL}"
-            tal:condition="python: not hasattr(view.request.user, 'getLogin')">
+            tal:condition="python: not hasattr(view.request.user, 'getLogin')"
+            i18n:translate="">
             [Login]</a>          
       </div>
       <img tal:attributes="src context/++resource++zope3logo.gif" />
@@ -66,15 +68,15 @@
 
     <div id="navigators">
 
-    <!-- Ugly is better than lobotomized.
-    -->
+    <!-- Ugly is better than lobotomized. -->
       <div class="box" id="navigationTree">
-        <h4>Navigation</h4>
+        <h4 i18n:translate="">Navigation</h4>
         <div
             xmlns="http://www.zope.org/zope3xmltree"
             id="navtreecontents"
             class="body"
             onclick="treeclicked(event);"
+            i18n:translate=""
             >Loading...
         </div>
       </div>
@@ -83,7 +85,7 @@
            tal:define="view context/@@commonTasks|nothing"
            tal:condition="view/strip|nothing">
 
-        <h4>Common Tasks</h4>
+        <h4 i18n:translate="">Common Tasks</h4>
         <div class="body">
           <span tal:replace="structure view" />
         </div>
@@ -92,7 +94,7 @@
       <!-- Tree of the help topics that appears on the help namespace -->
       <div class="box" id="help"
            tal:condition="not:python:request.getURL().find('++help++')==-1">
-        <h4>Online Help - TOC</h4>              
+        <h4 i18n:translate="">Online Help - TOC</h4>              
         <div class="body">
           <div tal:content="structure view/getTopicTree|nothing"
                tal:omit-tag="">content of topicTree</div>
@@ -108,14 +110,14 @@
 
       <div id="breadcrumbs"
            metal:define-macro="breadcrumbs"
-       > Location:&nbsp;<tal:block
+       > <div tal:omit-tag="" i18n:translate="">Location:&nbsp;</div><tal:block
            repeat="breadcrumb context/@@absolute_url/breadcrumbs"
           ><a href=""
               tal:condition="repeat/breadcrumb/start"
-              tal:content="string:[top]"
               tal:attributes="
               href string:${breadcrumb/url}/@@SelectedManagementView.html"
-              >XXX should not hardcode root folder name string</a
+              i18n:translate=""
+              >[top]</a
              ><a href=""
                  tal:condition="not:repeat/breadcrumb/start"
                  tal:content="string:${breadcrumb/name}"
@@ -130,14 +132,15 @@
           <a href=""
             tal:attributes="href view/action;
                             class view/selected;"
-            tal:content="view/title">
+            tal:content="view/title"
+            i18n:translate="">
             label
           </a>
         </tal:block>
       </div>
 
-      <!-- OnlineHelp with popup support like in zope2 -->
-      <div id="actions" 
+      <!-- OnlineHelp with popup support -->
+      <div id="actions"
            tal:define="help_actions context/@@view_get_menu/help_actions;
                        actions context/@@view_get_menu/zmi_actions"
            metal:define-slot="tabs">
@@ -159,7 +162,8 @@
                                            + url + ',' 
                                            + name + ','
                                            + settings +')'"
-               tal:content="help_info/title">
+               tal:content="help_info/title"
+               i18n:translate="">
               Action name
           </a>
         </span>
@@ -168,7 +172,8 @@
           <a href="#"
                tal:repeat="info actions"
                tal:attributes="href info/action"
-               tal:content="info/title">
+               tal:content="info/title"
+               i18n:translate="">
               Action name
           </a>
         </span>
@@ -207,7 +212,7 @@
           <div id="helpers">
 
             <div class="box" id="itemHelp" tal:condition="pagetip|nothing">
-              <h4>Tip</h4>
+              <h4 i18n:translate="">Tip</h4>
               <div class="body">
                 <div class="content odd">
                   <metal:block define-slot="pagetip"
@@ -223,7 +228,7 @@
             <div class="box" id="help"
                 tal:define="results view/@@find_help_topics|nothing"
                 tal:condition="results">
-              <h4>Online Help</h4>
+              <h4 i18n:translate="">Online Help</h4>
               <div class="body">
                 <div tal:repeat="entry results" tal:omit-tag="">
                 <a href="#"
@@ -244,7 +249,8 @@
                     >
                   <div tal:define="oddrow repeat/entry/odd"
                        tal:attributes="class python:oddrow and 'even' or 'odd'"
-                       tal:content="entry/topic/title">Topic Title
+                       tal:content="entry/topic/title"
+                       i18n:translate="">Topic Title
                   </div>
                 </a>
               </div>
@@ -264,7 +270,7 @@
                 tal:define="view context/@@MetaDataBox|nothing"
                 tal:condition="view/strip|nothing">
 
-              <h4>Metadata</h4>
+              <h4 i18n:translate="">Metadata</h4>
 
               <div class="body">
 


=== Zope3/src/zope/app/browser/skins/rotterdam/view_macros.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/view_macros.pt:1.2	Mon Jun 30 13:10:57 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/view_macros.pt	Wed Aug  6 10:41:54 2003
@@ -5,6 +5,7 @@
   <title 
     metal:define-slot="title"
     tal:content="options/getTitle|view/getTitle|context/getTitle|default"
+    i18n:translate=""
     >Zope</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <link href="/@@/zopetopBasic.css" rel="stylesheet" type="text/css"
@@ -20,8 +21,8 @@
 
   <table metal:define-macro="zmi_tabs"><tr>
     <td tal:repeat="view context/@@view_get_menu/zmi_views">
-    <a href="" tal:attributes="href view/action" tal:content="view/title">
-        label</a>
+    <a href="" tal:attributes="href view/action" tal:content="view/title"
+       i18n:translate="">label</a>
     <tal:block condition="not: repeat/view/end">'</tal:block>
     </td>
    </tr></table>
@@ -31,11 +32,13 @@
   </div>
 
   <div metal:define-macro="logged_user">
-  <p>User: <span tal:replace="request/user/getTitle">User</span></p>
+    <p i18n:translate="">User: 
+      <span tal:replace="request/user/getTitle">User</span>
+    </p>
   </div>
 
   <div metal:define-macro="footer">
-  <p>Powered by Zope</p>
+    <p i18n:translate="">Powered by Zope</p>
   </div>
 
 </body>




More information about the Zope3-Checkins mailing list