[Zope3-checkins] CVS: Zope3/src/zope/app/browser/catalog - advanced.pt:1.4 configure.zcml:1.9

Thu Aug 7 14:41:59 EDT 2003

Update of /cvs-repository/Zope3/src/zope/app/browser/catalog
In directory cvs.zope.org:/tmp/cvs-serv26029/catalog

Modified Files:
	advanced.pt configure.zcml 
Log Message:
Internationalized the rest of zope/app/browser.

I also took the chance to clean up some old code and remove a lot of cruft.
(This is the reason I decided to do it instead of letting a less 
experienced developer do it.)

I now consider I18n of the Zope core done. What does this mean to you?

1. All code you check into the CVS must be internationalized. That means:

   (a) Python and PT code must be properly tagged.

   (b) zope.pot must be updated. This can be done with::

       [zope/app/translation_files]$ python extract.py

       Note: You do not need to merge the new POT file with the catalogs.

2. Any code snippet that has no I18n is considered a bug! Therefore, please
   take care and do the I18n and make code so when you see missing spots.

Finally I would like to mention that some forms might experience some 
hickups, as I changed and moved around a lot of templates and was not able
to verify them all by hand. Please let me know, if something that used to 
work is not working anymore.


=== Zope3/src/zope/app/browser/catalog/advanced.pt 1.3 => 1.4 ===

--- Zope3/src/zope/app/browser/catalog/advanced.pt:1.3	Wed Aug  6 10:41:26 2003
+++ Zope3/src/zope/app/browser/catalog/advanced.pt	Thu Aug  7 13:40:22 2003
@@ -1,6 +1,7 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 <div metal:fill-slot="body">
+
   <table border="0">
     <caption i18n:translate="">Advanced Catalog Thingies</caption>
     <tbody>
@@ -54,6 +55,7 @@
       </tr>
     </tbody>
   </table>
+
 </div>
 </body>
 </html>


=== Zope3/src/zope/app/browser/catalog/configure.zcml 1.8 => 1.9 ===
--- Zope3/src/zope/app/browser/catalog/configure.zcml:1.8	Wed Aug  6 10:41:26 2003
+++ Zope3/src/zope/app/browser/catalog/configure.zcml	Thu Aug  7 13:40:22 2003
@@ -1,21 +1,19 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser">
+<configure xmlns="http://namespaces.zope.org/browser">
 
   <!-- Allow a catalog to be added to content space -->
-  <browser:menuItem 
+  <menuItem 
       menu="add_content"
       for="zope.app.interfaces.container.IAdding"
       title="Catalog"
       action="zope.app.catalog"
       description="Catalog" />
   
-  <browser:icon 
+  <icon 
       name="zmi_icon" 
       for="zope.app.interfaces.catalog.catalog.ICatalog"
       file="catalog_icon.gif"/>
   
-  <browser:menuItem
+  <menuItem
       menu="add_component"
       action="zope.app.catalogutility"
       title="Catalog"
@@ -23,7 +21,7 @@
       permission="zope.ManageServices" />
   
   <!-- Standard container 'contents' tab -->
-  <browser:page
+  <page
       for="zope.app.interfaces.catalog.catalog.ICatalog"
       name="contents.html"
       menu="zmi_views"
@@ -33,22 +31,22 @@
       permission="zope.ManageContent" />
   
   <!-- This hooks up a custom add menu.  -->
-  <browser:view
+  <view
        for="zope.app.interfaces.catalog.catalog.ICatalog"
        name="+"
        menu="zmi_actions" title="Add"
        class="zope.app.browser.catalog.catalog.IndexAdding"
        permission="zope.ManageContent">
-     <browser:page name="index.html"  attribute="index" />
-     <browser:page name="action.html" attribute="action" />
-  </browser:view>
+     <page name="index.html"  attribute="index" />
+     <page name="action.html" attribute="action" />
+  </view>
   
   <!-- the add menu is browser.IndexAdding -->
-  <browser:menu id="catalog_index_menu" title="Add Index" />
+  <menu id="catalog_index_menu" title="Add Index" />
   
   <!-- Add a couple of items to the add menu -->
   <!-- TextIndex -->
-  <browser:addform
+  <addform
     name="AddTextIndexToCatalog"
     menu="catalog_index_menu" title="Text Index"
     schema="zope.app.interfaces.index.text.IUITextCatalogIndex"
@@ -59,7 +57,7 @@
     description="A full text index" />
   
   <!-- FieldIndex -->
-  <browser:addform
+  <addform
     name="AddFieldIndexToCatalog"
     menu="catalog_index_menu" title="Field Index"
     schema="zope.app.interfaces.index.field.IUIFieldCatalogIndex"
@@ -70,7 +68,7 @@
     description="An index of a specific field" />
   
   <!-- KeywordIndex -->
-  <browser:addform
+  <addform
     name="AddKeywordIndexToCatalog"
     menu="catalog_index_menu" title="Keyword Index"
     schema="zope.app.interfaces.index.keyword.IUIKeywordCatalogIndex"
@@ -81,18 +79,17 @@
     description="A keyword index of a specific field" />
   
   <!-- the Advanced tab of the Catalog -->
-  <browser:pages
+  <pages
       for="zope.app.interfaces.catalog.catalog.ICatalog"
       class="zope.app.browser.catalog.catalog.CatalogEditView"
       permission="zope.ManageContent">
   
-    <browser:page name="index.html" template="advanced.pt"
-        menu="zmi_views" title="Advanced"/>
-  
-    <browser:page name="subscribe.html" attribute="subscribe"/>
-    <browser:page name="unsubscribe.html" attribute="unsubscribe"/>
-    <browser:page name="clear.html" attribute="clear"/>
-    <browser:page name="reindex.html" attribute="reindex"/>
-  </browser:pages>
+    <page name="index.html" template="advanced.pt"
+          menu="zmi_views" title="Advanced"/>
+    <page name="subscribe.html" attribute="subscribe"/>
+    <page name="unsubscribe.html" attribute="unsubscribe"/>
+    <page name="clear.html" attribute="clear"/>
+    <page name="reindex.html" attribute="reindex"/>
+  </pages>
 
 </configure>


