[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/apidoc/ I18n doman
for apidoc changed to "zope". Work on apidoc i18n started.
Dmitry Vasiliev
dima at hlabs.spb.ru
Mon May 24 08:16:39 EDT 2004
Log message for revision 24920:
I18n doman for apidoc changed to "zope". Work on apidoc i18n started.
-=-
Modified: Zope3/trunk/src/zope/app/apidoc/browser/apidoc.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/apidoc.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/apidoc.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -38,5 +38,6 @@
items.sort()
return [{'name': name,
'title': module.title,
+ # FIXME: Seems like stx2html() doesn't like message ids
'description': stx2html(module.description)}
for name, module in items ]
Modified: Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,6 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/browser"
- i18n_domain="api_doc">
+ i18n_domain="zope">
<resource name="apidoc.css" file="apidoc.css" />
@@ -33,7 +33,7 @@
<page
name="index.html"
- template="index.html" />
+ template="index.pt" />
<page
name="modulelist.html"
@@ -41,7 +41,7 @@
<page
name="menu.html"
- template="menu.html" />
+ template="menu.pt" />
<page
name="contents.html"
Modified: Zope3/trunk/src/zope/app/apidoc/browser/contents.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/contents.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/contents.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,19 +1,21 @@
<html metal:use-macro="views/apidoc_macros/details">
<body metal:fill-slot="contents">
- <h1>Zope 3 API Documentation</h1>
+ <h1 i18n:translate="">Zope 3 API Documentation</h1>
- <p>Welcome to the Zope 3 API documentation tool. The documentation provided
- here is separated in several discrete documentation modules. You can see
- the list of available modules in the top-left box on your screen. When you
- click on a module, the module's menu will appear below. In the menu you
- have then navigational means to access the documentation content of the
+ <p i18n:translate="">Welcome to the Zope 3 API documentation tool.
+ The documentation provided here is separated in several discrete
+ documentation modules. You can see the list of available modules
+ in the top-left box on your screen. When you click on a module,
+ the module's menu will appear below. In the menu you have then
+ navigational means to access the documentation content of the
module.</p>
- <p>Modules are usually depending on each other by using links that create
- references across all modules. Each module has a "theme" that it follows,
- which was designed to aid the developer directly to the desired
- information. Below you see a short description of every module.</p>
+ <p i18n:translate="">Modules are usually depending on each other by
+ using links that create references across all modules. Each module
+ has a "theme" that it follows, which was designed to aid the developer
+ directly to the desired information. Below you see a short description
+ of every module.</p>
<tal:omit-tag repeat="module view/getModuleList">
@@ -26,4 +28,4 @@
</tal:omit-tag>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/browser/details_macros.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/details_macros.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/details_macros.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -4,7 +4,7 @@
xmlns="http://www.w3.org/1999/xhtml"
xml:lang="en"
lang="en"
- i18n:domain="apidoc">
+ i18n:domain="zope">
<head>
<title metal:define-slot="title" i18n:translate="">Z3 UI</title>
@@ -31,4 +31,4 @@
</body>
</html>
-</metal:block>
\ No newline at end of file
+</metal:block>
Modified: Zope3/trunk/src/zope/app/apidoc/browser/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/ftests.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/ftests.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -26,7 +26,7 @@
basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 200)
body = response.getBody()
- self.assert_(body.find('Click on one of the Documentation Modules') > 0)
+ self.assert_(body.find('Click on one of the Documentation') > 0)
self.checkForBrokenLinks(body, '/++apidoc++/menu.html',
basic='mgr:mgrpw')
@@ -55,7 +55,7 @@
self.assertEqual(response.getStatus(), 200)
body = response.getBody()
self.assert_(body.find(
- '<a href="contents.html" target="main">Zope 3 API Docs</a>') > 0)
+ '<a href="contents.html" target="main">Zope') > 0)
self.checkForBrokenLinks(body, '/++apidoc++/modulelist.html',
basic='mgr:mgrpw')
Deleted: Zope3/trunk/src/zope/app/apidoc/browser/index.html
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/index.html 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/index.html 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,13 +0,0 @@
-<html>
- <head>
- <title>Zope 3 API Docs</title>
- </head>
- <frameset cols="20%, *" border="1">
- <frameset rows="120, *">
- <frame name="modules" src="modulelist.html" border="1">
- <frame name="menu" src="menu.html" border="1">
- </frameset>
- <frame name="main" src="contents.html" border="1">
- </frameset>
-
-</html>
Copied: Zope3/trunk/src/zope/app/apidoc/browser/index.pt (from rev 24840, Zope3/trunk/src/zope/app/apidoc/browser/index.html)
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/index.html 2004-05-20 01:08:48 UTC (rev 24840)
+++ Zope3/trunk/src/zope/app/apidoc/browser/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -0,0 +1,13 @@
+<html>
+ <head>
+ <title i18n:translate="">Zope 3 API Docs</title>
+ </head>
+ <frameset cols="20%, *" border="1">
+ <frameset rows="120, *">
+ <frame name="modules" src="modulelist.html" border="1">
+ <frame name="menu" src="menu.html" border="1">
+ </frameset>
+ <frame name="main" src="contents.html" border="1">
+ </frameset>
+
+</html>
Deleted: Zope3/trunk/src/zope/app/apidoc/browser/menu.html
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/menu.html 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/menu.html 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,10 +0,0 @@
-<html metal:use-macro="views/apidoc_macros/menu">
-<body>
-
- <div metal:fill-slot="menu">
- <p class="small">Click on one of the Documentation Modules above and a menu
- for this module will appear.</p>
- </div>
-
-</body>
-</html>
\ No newline at end of file
Copied: Zope3/trunk/src/zope/app/apidoc/browser/menu.pt (from rev 24825, Zope3/trunk/src/zope/app/apidoc/browser/menu.html)
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/menu.html 2004-05-19 12:36:44 UTC (rev 24825)
+++ Zope3/trunk/src/zope/app/apidoc/browser/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -0,0 +1,10 @@
+<html metal:use-macro="views/apidoc_macros/menu">
+<body>
+
+ <div metal:fill-slot="menu">
+ <p class="small" i18n:translate="">Click on one of the Documentation
+ Modules above and a menu for this module will appear.</p>
+ </div>
+
+</body>
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/browser/menu_macros.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/menu_macros.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/menu_macros.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -4,7 +4,7 @@
xmlns="http://www.w3.org/1999/xhtml"
xml:lang="en"
lang="en"
- i18n:domain="apidoc">
+ i18n:domain="zope">
<head>
<!-- Waaa -->
@@ -31,7 +31,7 @@
<body>
- <div class="menu">Menu</div>
+ <div class="menu" i18n:translate="">Menu</div>
<metal:block define-slot="pre_menu" />
@@ -101,4 +101,4 @@
</body>
</html>
-</metal:block>
\ No newline at end of file
+</metal:block>
Modified: Zope3/trunk/src/zope/app/apidoc/browser/modules.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/modules.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/browser/modules.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -3,7 +3,8 @@
style="padding: 0; margin: 0">
<div class="apihead">
- <a href="contents.html" target="main">Zope 3 API Docs</a>
+ <a href="contents.html" target="main" i18n:translate="">Zope
+ 3 API Docs</a>
</div>
<div style="margin-left: 0.5em">
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -28,6 +28,7 @@
from zope.interface import Interface, Attribute, implements, implementedBy
from zope.app import zapi
from zope.app.container.interfaces import IReadContainer
+from zope.app.i18n import ZopeMessageIDFactory as _
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
@@ -508,7 +509,7 @@
implements(IDocumentationModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'Classes'
+ title = _('Classes')
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/browser.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/browser.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -235,9 +235,9 @@
[('interface', 'zope.app.apidoc.interfaces.IDocumentationModule'),
('name', 'title'),
('read_perm', None),
- ('type', 'str'),
- ('type_link', '__builtin__.str'),
- ('value', "'Classes'"),
+ ('type', 'MessageID'),
+ ('type_link', 'zope.i18nmessageid.messageid.MessageID'),
+ ('value', "u'Classes'"),
('write_perm', None)]
"""
attrs = []
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/class_index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/class_index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/class_index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -13,7 +13,7 @@
</div>
- <h2 class="details-section">Bases</h2>
+ <h2 class="details-section" i18n:translate="">Bases</h2>
<div class="indent"
tal:define="bases view/getBases">
@@ -27,12 +27,12 @@
</ul>
<p tal:condition="not: bases">
- <em>There are no base classes.</em>
+ <em i18n:translate="">There are no base classes.</em>
</p>
</div>
- <h2 class="details-section">Implemented Interfaces</h2>
+ <h2 class="details-section" i18n:translate="">Implemented Interfaces</h2>
<div class="indent"
tal:define="ifaces view/getInterfaces">
@@ -47,13 +47,13 @@
</ul>
<p tal:condition="not: ifaces">
- <em>There are no implemented interfaces.</em>
+ <em i18n:translate="">There are no implemented interfaces.</em>
</p>
</div>
- <h2 class="details-section">Attributes/Properties</h2>
+ <h2 class="details-section" i18n:translate="">Attributes/Properties</h2>
<div class="indent"
tal:define="attributes view/getAttributes">
@@ -66,17 +66,17 @@
(type: <code tal:content="attr/type" />)
</tal:omit-tag>
<tal:omit-tag condition="attr/type_link">
- (type:
+ (<span i18n:translate="">type:</span>
<a href=""
tal:attributes="href string:./index.html?path=${attr/type_link}">
<code tal:content="attr/type" /></a>)
</tal:omit-tag>
<br/>
- <i>Value:</i>
+ <i i18n:translate="">Value:</i>
<code tal:content="attr/value">u''</code><br />
<span class="small" tal:condition="attr/interface">
- <i>Interface:</i>
+ <i i18n:translate="">Interface:</i>
<a href=""
tal:attributes="href
string:${view/getBaseURL}/Interface/${attr/interface}/apiindex.html"
@@ -93,13 +93,13 @@
</ul>
<p tal:condition="not: attributes">
- <em>There are no attributes in this class.</em>
+ <em i18n:translate="">There are no attributes in this class.</em>
</p>
</div>
- <h2 class="details-section">Methods</h2>
+ <h2 class="details-section" i18n:translate="">Methods</h2>
<div class="indent"
tal:define="methods view/getMethods">
@@ -115,7 +115,7 @@
</div>
<span class="small" tal:condition="method/interface">
- <i>Interface:</i>
+ <i i18n:translate="">Interface:</i>
<a href=""
tal:attributes="href
string:${view/getBaseURL}/Interface/${method/interface}/apiindex.html"
@@ -124,7 +124,7 @@
<span class="small"
tal:condition="python: method['read_perm'] and method['write_perm']">
- <i>Permissions:</i>
+ <i i18n:translate="">Permissions:</i>
<span tal:replace="method/read_perm">zope.View</span> (read),
<span tal:replace="method/write_perm">zope.View</span> (write)
</span>
@@ -133,7 +133,7 @@
</ul>
<p tal:condition="not: methods">
- <em>There are no methods in this class.</em>
+ <em i18n:translate="">There are no methods in this class.</em>
</p>
</div>
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/ftests.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/ftests.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -26,7 +26,7 @@
basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 200)
body = response.getBody()
- self.assert_(body.find('Browse Zope Source') > 0)
+ self.assert_(body.find('Zope Source') > 0)
self.checkForBrokenLinks(body, '/++apidoc++/Class/menu.html',
basic='mgr:mgrpw')
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/function_index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/function_index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/function_index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -6,7 +6,7 @@
zope.app.function
</h1>
- <h2 class="details-section">Signature</h2>
+ <h2 class="details-section" i18n:translate="">Signature</h2>
<div class="indent">
<b><code
@@ -15,7 +15,7 @@
</div>
<div tal:condition="context/getDocString">
- <h2 class="details-section">Documentation String</h2>
+ <h2 class="details-section" i18n:translate="">Documentation String</h2>
<div class="indent">
<div class="documentation" tal:content="structure context/getDocString">
@@ -28,7 +28,7 @@
tal:define="attributes view/getAttributes"
tal:condition="attributes">
- <h2 class="details-section">Attributes</h2>
+ <h2 class="details-section" i18n:translate="">Attributes</h2>
<div class="indent">
@@ -37,17 +37,18 @@
<li tal:repeat="attr attributes">
<b><code tal:content="attr/name">attr</code></b>
<tal:omit-tag condition="not: attr/type_link">
- (type: <code tal:content="attr/type" />)
+ (<span i18n:translate="">type:</span>
+ <code tal:content="attr/type" />)
</tal:omit-tag>
<tal:omit-tag condition="attr/type_link">
- (type:
+ (<span i18n:translate="">type:</span>
<a href=""
tal:attributes="href
string:${view/getBaseURL}/Class/${attr/type_link}/index.html">
<code tal:content="attr/type" /></a>)
</tal:omit-tag>
<br/>
- <i>Value:</i>
+ <i i18n:translate="">Value:</i>
<code tal:content="attr/value">u''</code><br />
</li>
@@ -57,4 +58,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/menu.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/menu.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -15,19 +15,20 @@
</div>
<div>
- Class Finder: <br/>
- <i>(Enter partial Python path)</i></div>
+ <span i18n:translate="">Class Finder:</span> <br/>
+ <i i18n:translate="">(Enter partial Python path)</i></div>
<form action="menu.html" method="POST">
<input type="text" name="path"
style="font-size: 80%; width=95%" />
<input type="submit" name="SUBMIT" value="Find"
- style="font-size: 80%"/>
+ i18n:attributes="value find-button" style="font-size: 80%"/>
</form>
<p style="font-size: 120%">
- <a href="./index.html" target="main">Browse Zope Source</a>
+ <a href="./index.html" target="main" i18n:translate="">Browse
+ Zope Source</a>
</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/classmodule/module_index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/classmodule/module_index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/classmodule/module_index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,7 +1,7 @@
<html metal:use-macro="views/apidoc_macros/details">
<body metal:fill-slot="contents">
- <h1 class="details-header">Zope 3 Class Browser</h1>
+ <h1 class="details-header" i18n:translate="">Zope 3 Class Browser</h1>
<p class="breadcrumbs">
<span tal:repeat="entry view/getBreadCrumbs">
@@ -42,4 +42,4 @@
</tr></table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/configure.zcml 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/configure.zcml 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,6 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="api_doc">
+ i18n_domain="zope">
<class class=".APIDocumentation">
<require
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -27,6 +27,7 @@
from zope.app.location import LocationProxy
from zope.app.component.interface \
import queryInterface, searchInterfaceUtilities
+from zope.app.i18n import ZopeMessageIDFactory as _
class IInterfaceModule(IDocumentationModule):
"""Interface API Documentation Module
@@ -69,7 +70,7 @@
implements(IInterfaceModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'Interfaces'
+ title = _('Interfaces')
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -23,7 +23,7 @@
</div>
- <h2 class="details-section">Bases</h2>
+ <h2 class="details-section" i18n:translate="">Bases</h2>
<div class="indent"
tal:define="bases view/getBases">
@@ -37,13 +37,13 @@
</ul>
<p tal:condition="not: bases">
- <em>There are no base classes.</em>
+ <em i18n:translate="">There are no base classes.</em>
</p>
</div>
- <h2 class="details-section">Attributes/Fields</h2>
+ <h2 class="details-section" i18n:translate="">Attributes/Fields</h2>
<div class="indent"
tal:define="attributes view/getAttributes;
@@ -53,7 +53,8 @@
tal:condition="python: attributes or fields">
<li tal:repeat="attr attributes">
- <b><code tal:content="attr/name">attr</code></b> (Attribute)<br>
+ <b><code tal:content="attr/name">attr</code></b>
+ <span i18n:translate="">(Attribute)</span><br>
<div class="inline-documentation" tal:content="structure attr/doc">
attr desc
</div>
@@ -72,14 +73,14 @@
</ul>
<p tal:condition="python: not (attributes or fields)">
- <em>There are no attributes or fields specified.</em>
+ <em i18n:translate="">There are no attributes or fields specified.</em>
</p>
</div>
- <h2 class="details-section">Methods</h2>
+ <h2 class="details-section" i18n:translate="">Methods</h2>
<div class="indent">
@@ -95,20 +96,20 @@
</ul>
<p tal:condition="not: view/getMethods">
- <em>There are no methods specified.</em>
+ <em i18n:translate="">There are no methods specified.</em>
</p>
</div>
- <h2 class="details-section">Adapters</h2>
+ <h2 class="details-section" i18n:translate="">Adapters</h2>
<div class="indent"
tal:define="adapters view/getRequiredAdapters"
tal:condition="adapters">
- <h3>Adapters where this interface is required:</h3>
+ <h3 i18n:translate="">Adapters where this interface is required:</h3>
<ul class="attr-list">
<li tal:repeat="adapter adapters">
<b><code>
@@ -121,15 +122,16 @@
tal:condition="not: adapter/factory_url" />
</code></b>
<span tal:condition="adapter/name">
- (name: <tal:block content="adapter/name" />)
+ (<span i18n:translate="">name:</span>
+ <tal:block content="adapter/name" />)
</span>
<br />
- <i>provides:</i>
+ <i i18n:translate="">provides:</i>
<a href=""
tal:attributes="href string:../${adapter/provided}/apiindex.html"
tal:content="adapter/provided" /><br />
<tal:block condition="adapter/required">
- <i>also required:</i>
+ <i i18n:translate="">also required:</i>
<tal:block repeat="iface adapter/required">
<a href=""
tal:attributes="href string:../$iface/apiindex.html"
@@ -146,7 +148,7 @@
tal:define="adapters view/getProvidedAdapters"
tal:condition="adapters">
- <h3>Adapters that provide this interface:</h3>
+ <h3 i18n:translate="">Adapters that provide this interface:</h3>
<ul>
<li tal:repeat="adapter adapters">
<b><code>
@@ -158,17 +160,18 @@
tal:condition="not: adapter/factory_url" />
</code></b>
<span tal:condition="adapter/name">
- (name: <tal:block content="adapter/name" />)
+ (<span i18n:translate="">name:</span>
+ <tal:block content="adapter/name" />)
</span>
<br />
- <i>requires:</i>
+ <i i18n:translate="">requires:</i>
<tal:block repeat="iface adapter/required">
<a href=""
tal:condition="iface"
tal:attributes="href string:../$iface/"
tal:content="iface" /><tal:block
condition="not:repeat/iface/end">, </tal:block>
- <span tal:condition="not: iface">
+ <span tal:condition="not: iface" i18n:translate="">
No interface required.
</span>
</tal:block>
@@ -179,7 +182,8 @@
<p tal:condition="
python: not (view.getRequiredAdapters() or view.getProvidedAdapters())">
- <em>There are no adapters registered for this interface.</em>
+ <em i18n:translate="">There are no adapters registered for
+ this interface.</em>
</p>
<div tal:define="factories view/getFactories;
@@ -193,9 +197,9 @@
<div class="indent">
<tal:block condition="factories">
- <h3 class="details-section">Factories</h3>
+ <h3 class="details-section" i18n:translate="">Factories</h3>
<div class="indent">
- <div class="small">
+ <div class="small" i18n:translate="">
A list of factories that create objects implement this interface.
</div>
<ul>
@@ -211,9 +215,9 @@
</tal:block>
<tal:block condition="utilities">
- <h3 class="details-section">Utilities</h3>
+ <h3 class="details-section" i18n:translate="">Utilities</h3>
<div class="indent">
- <div class="small">
+ <div class="small" i18n:translate="">
A list of utilities that are are registered to provide this
interface.
</div>
@@ -224,7 +228,7 @@
string:../../Utility/${view/getId}/${utility/url_name}/index.html"
tal:content="structure utility/name" />
<br />
- <div>Class: <code>
+ <div><span i18n:translate="">Class:</span> <code>
<a href=""
tal:attributes="href
string:../../Class/${utility/url}/index.html"
@@ -236,9 +240,9 @@
</tal:block>
<tal:block condition="services">
- <h3 class="details-section">Service</h3>
+ <h3 class="details-section" i18n:translate="">Service</h3>
<div class="indent">
- <div class="small">
+ <div class="small" i18n:translate="">
A list of services (usually just one) that are are registered to
provide this interface.
</div>
@@ -253,9 +257,9 @@
</tal:block>
<tal:block condition="classes">
- <h3 class="details-section">Classes</h3>
+ <h3 class="details-section" i18n:translate="">Classes</h3>
<div class="indent">
- <div class="small">
+ <div class="small" i18n:translate="">
A list of classes that implement this interface. This might
duplicate the entries in Utilities and Services.
</div>
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/menu.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/menu.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,10 +1,10 @@
<html metal:use-macro="views/apidoc_macros/menu">
<body>
- <p metal:fill-slot="post_menu" class="small">
+ <p metal:fill-slot="post_menu" class="small" i18n:translate="">
Note: These are only interfaces that are registered with the Interface
Service.
</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/servicemodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/servicemodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/servicemodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -23,6 +23,7 @@
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
from zope.app.servicenames import Services
+from zope.app.i18n import ZopeMessageIDFactory as _
class Service(object):
"""Object representing a service in the API documentation"""
@@ -69,7 +70,7 @@
implements(IDocumentationModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'Services'
+ title = _('Services')
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
Modified: Zope3/trunk/src/zope/app/apidoc/servicemodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/servicemodule/index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/servicemodule/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -14,7 +14,7 @@
</div>
<div class="indent">
- <h3>Interface:
+ <h3><span i18n:translate="">Interface:</span>
<a href=""
tal:attributes="href
string:../../Interface/${iface/getId}/apiindex.html"
@@ -23,7 +23,7 @@
</h3>
</div>
- <h2 class="details-section">Attributes/Fields</h2>
+ <h2 class="details-section" i18n:translate="">Attributes/Fields</h2>
<div class="indent"
tal:define="attributes iface/getAttributes;
@@ -52,14 +52,14 @@
</ul>
<p tal:condition="python: not (attributes or fields)">
- <em>There are no attributes or fields specified.</em>
+ <em i18n:translate="">There are no attributes or fields specified.</em>
</p>
</div>
- <h2 class="details-section">Methods</h2>
+ <h2 class="details-section" i18n:translate="">Methods</h2>
<div class="indent"
tal:define="methods iface/getMethods">
@@ -76,14 +76,14 @@
</ul>
<p tal:condition="not: methods">
- <em>There are no methods or fields specified.</em>
+ <em i18n:translate="">There are no methods or fields specified.</em>
</p>
</div>
- <h2 class="details-section">Implementations</h2>
+ <h2 class="details-section" i18n:translate="">Implementations</h2>
<div class="indent">
<ul>
<li tal:repeat="impl view/implementations">
@@ -95,4 +95,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/servicemodule/menu.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/servicemodule/menu.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/servicemodule/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,9 +1,9 @@
<html metal:use-macro="views/apidoc_macros/menu">
<body>
- <p metal:fill-slot="pre_menu" class="small">
+ <p metal:fill-slot="pre_menu" class="small" i18n:translate="">
This is a list of all available services by name.
</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/utilitymodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/utilitymodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/utilitymodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -18,6 +18,7 @@
from zope.interface import implements
from zope.app import zapi
+from zope.app.i18n import ZopeMessageIDFactory as _
from zope.app.component.localservice import queryNextService
from zope.app.location.interfaces import ILocation
from zope.app.servicenames import Utilities
@@ -128,8 +129,8 @@
implements(IDocumentationModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'Utilities'
-
+ title = _('Utilities')
+
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
Utilities are also nicely registered in a service, so that it is easy to
@@ -141,7 +142,7 @@
Again, the documentation of a utility lists all the attributes/fields and
methods the utility provides and provides a link to the implementation.
"""
-
+
def get(self, key, default=None):
parts = key.split('.')
try:
Modified: Zope3/trunk/src/zope/app/apidoc/utilitymodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/utilitymodule/index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/utilitymodule/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -14,7 +14,7 @@
tal:define="component view/getComponent"
tal:condition="component">
<h3>
- Component:
+ <span i18n:translate="">Component:</span>
<a href=""
tal:attributes="href
string:../../../Class/${component/url}/index.html"
@@ -27,7 +27,7 @@
</div>
</div>
- <h2 class="details-section">Attributes/Fields</h2>
+ <h2 class="details-section" i18n:translate="">Attributes/Fields</h2>
<div class="indent"
tal:define="attributes iface/getAttributes;
@@ -37,7 +37,8 @@
tal:condition="python: attributes or fields">
<li tal:repeat="attr attributes">
- <b><code tal:content="attr/name">attr</code></b> (Attribute)<br>
+ <b><code tal:content="attr/name">attr</code></b>
+ <span i18n:translate="">(Attribute)</span><br>
<div class="inline-documentation" tal:content="structure attr/doc">
attr desc
</div>
@@ -57,14 +58,14 @@
</ul>
<p tal:condition="python: not (attributes or fields)">
- <em>There are no attributes or fields specified.</em>
+ <em i18n:translate="">There are no attributes or fields specified.</em>
</p>
</div>
- <h2 class="details-section">Methods</h2>
+ <h2 class="details-section" i18n:translate="">Methods</h2>
<div class="indent"
tal:define="methods iface/getMethods">
@@ -81,11 +82,11 @@
</ul>
<p tal:condition="not: methods">
- <em>There are no methods or fields specified.</em>
+ <em i18n:translate="">There are no methods or fields specified.</em>
</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/viewmodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/viewmodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/viewmodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -61,7 +61,7 @@
implements(IDocumentationModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'Presentations'
+ title = _('Presentations')
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
@@ -87,7 +87,7 @@
and Usages" that brings you to a simple screen that shows the mapping of
the layers to skins and provides a list of available usages.
"""
-
+
def getSkins(self):
"""Get the names of all available skins.
Modified: Zope3/trunk/src/zope/app/apidoc/viewmodule/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/viewmodule/ftests.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/viewmodule/ftests.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -48,7 +48,8 @@
self.assertEqual(response.getStatus(), 200)
body = response.getBody()
self.assert_(body.find(
- 'IBrowserRequest views for \n IDocumentationModule') > 0)
+ 'IBrowserRequest\n <span>views for</span>\n'
+ ' IDocumentationModule') > 0)
self.checkForBrokenLinks(
body, '/++apidoc++/Views/index.html',
basic='mgr:mgrpw')
Modified: Zope3/trunk/src/zope/app/apidoc/viewmodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/viewmodule/index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/viewmodule/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -3,14 +3,15 @@
tal:define="layers view/getViewsByLayers">
<h1 class="details-header">
- <span tal:replace="view/type/__name__" /> views for
+ <span tal:replace="view/type/__name__" />
+ <span i18n:translate="">views for</span>
<span tal:replace="view/iface/__name__" />
</h1>
<span tal:repeat="layer layers">
<h2 class="details-section">
- "<span tal:replace="layer/name" />" Layer
+ "<span tal:replace="layer/name" />" <span i18n:translate="">Layer</span>
</h2>
<div class="indent">
@@ -24,7 +25,7 @@
<br />
</tal:omit-tag>
<div class="indent"><span class="small">
- <i>required:</i>
+ <i i18n:translate="">required:</i>
<a href=""
tal:condition="View/required"
tal:attributes="
@@ -32,14 +33,14 @@
tal:content="View/required" />
<span tal:condition="not:View/required">None</span>
<br />
- <i>presentation type:</i>
+ <i i18n:translate="">presentation type:</i>
<a href=""
tal:attributes="
href string:../Interface/${View/type}/apiindex.html"
tal:content="View/type" />
<br />
<tal:omit-tag condition="View/factory/path">
- <i>factory path:</i>
+ <i i18n:translate="">factory path:</i>
<a href=""
tal:condition="View/factory/referencable"
tal:attributes="href
@@ -51,7 +52,7 @@
<br />
</tal:omit-tag>
<tal:omit-tag condition="View/provided">
- <i>provided:</i>
+ <i i18n:translate="">provided:</i>
<a href=""
tal:attributes="href
string: ../Interface/${View/provided}/apiindex.html"
@@ -59,12 +60,12 @@
<br />
</tal:omit-tag>
<tal:omit-tag condition="View/factory/template">
- <i>template:</i>
+ <i i18n:translate="">template:</i>
<span tal:replace="View/factory/template" />
<br />
</tal:omit-tag>
<tal:omit-tag condition="View/factory/resource">
- <i>resource:</i>
+ <i i18n:translate="">resource:</i>
<a href=""
tal:attributes="href
string: /@@/${View/factory/resource}"
@@ -73,7 +74,7 @@
</tal:omit-tag>
<span
tal:condition="python: View['read_perm'] and View['write_perm']">
- <i>Permissions:</i>
+ <i i18n:translate="">Permissions:</i>
<span tal:replace="View/read_perm">zope.View</span> (read),
<span tal:replace="View/write_perm">zope.View</span> (write)
</span>
@@ -86,8 +87,9 @@
</span>
<p tal:condition="not: layers">
- <em>There are no views for this interface and presentation type.</em>
+ <em i18n:translate="">There are no views for this interface
+ and presentation type.</em>
</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/viewmodule/menu.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/viewmodule/menu.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/viewmodule/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -5,7 +5,7 @@
<form action="./index.html" target="main">
<p>
- Enter the interface name:
+ <span i18n:translate="">Enter the interface name:</span>
<select name="iface"
style="font-size: 80%; width=95%" >
<option
@@ -15,7 +15,7 @@
</select>
</p>
<p>
- Presentation Type:
+ <span i18n:translate="">Presentation Type:</span>
<select name="type"
style="font-size: 80%; width=95%" >
<option
@@ -25,17 +25,18 @@
</select>
</p>
<p>
- Show all views:
+ <span i18n:translate="">Show all views:</span>
<input type="checkbox" name="all" value="all"/>
</p>
<input type="submit" name="SUBMIT" value="Show"
+ i18n:attributes="value show-button"
style="font-size: 80%; width=95%"/>
</form>
- <a href="./skin_layer.html" target="main">
+ <a href="./skin_layer.html" target="main" i18n:translate="">
Show Skins and Layers
</a>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/viewmodule/skin_layer.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/viewmodule/skin_layer.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/viewmodule/skin_layer.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,17 +1,18 @@
<html metal:use-macro="views/apidoc_macros/details">
<body metal:fill-slot="contents">
- <h1 class="details-header">
+ <h1 class="details-header" i18n:translate="">
Skins & Layers
</h1>
- <p>In the small tree below you see a listing of all the available Zope 3
- skins (large bold font) and the layers (small bold font) for each
- skin. Below each entry you see some documentation that was registered. In
- the case of global skins and layers, the documentation shows the file and
- the line number in which the skin or layer was declared.</p>
+ <p i18n:translate="">In the small tree below you see a listing of
+ all the available Zope 3 skins (large bold font) and the layers
+ (small bold font) for each skin. Below each entry you see some
+ documentation that was registered. In the case of global skins
+ and layers, the documentation shows the file and the line number
+ in which the skin or layer was declared.</p>
- <h2 class="details-section">Skin-Layer Tree</h2>
+ <h2 class="details-section" i18n:translate="">Skin-Layer Tree</h2>
<table width="100%" border="0">
<tr>
@@ -25,7 +26,7 @@
<h3 style="padding-bottom: 0; margin-bottom: 0;">
<span tal:content="skin/name">Rotterdam</span>
<i style="font-weight: normal"
- tal:condition="skin/default">(default)</i>
+ tal:condition="skin/default" i18n:translate="">(default)</i>
</h3>
<div class="small">
<i tal:content="skin/doc">Skin Doc</i>
@@ -50,4 +51,4 @@
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2004-05-24 12:16:38 UTC (rev 24920)
@@ -25,6 +25,7 @@
from zope.configuration import docutils, xmlconfig
from zope.interface import implements
+from zope.app.i18n import ZopeMessageIDFactory as _
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
@@ -186,7 +187,7 @@
implements(IDocumentationModule)
# See zope.app.apidoc.interfaces.IDocumentationModule
- title = 'ZCML Reference'
+ title = _('ZCML Reference')
# See zope.app.apidoc.interfaces.IDocumentationModule
description = """
Modified: Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -10,22 +10,23 @@
<div class="indent"
tal:define="info view/getFileInfo"
tal:condition="info">
- <i>File:</i>
- <tal:block content="info/file"/>, from
- <tal:block content="string: (line ${info/line}, column ${info/column})"/> to
+ <i i18n:translate="">File:</i>
+ <tal:block content="info/file"/><span i18n:translate="">, from</span>
+ <tal:block content="string: (line ${info/line}, column ${info/column})"/>
+ <span i18n:translate="">to</span>
<tal:block content="string: (line ${info/eline}, column ${info/ecolumn})"/>
</div>
<div class="indent"
tal:condition="view/getInfo">
- <i>Info:</i>
+ <i i18n:translate="">Info:</i>
<tal:block replace="view/getInfo" />
</div>
<div class="indent"
tal:define="handler view/getHandler"
tal:condition="handler">
- <i>Handler:</i>
+ <i i18n:translate="">Handler:</i>
<a href=""
tal:attributes="href
string:../../../Class/${handler/url}/index.html"
@@ -33,7 +34,7 @@
</a>
</div>
- <h2 class="details-section">Schema</h2>
+ <h2 class="details-section" i18n:translate="">Schema</h2>
<div class="indent">
<a href=""
@@ -69,7 +70,7 @@
</ul>
<p tal:condition="not: fields">
- <em>There are no fields specified.</em>
+ <em i18n:translate="">There are no fields specified.</em>
</p>
</div>
@@ -78,7 +79,7 @@
define="dir view/getSubdirectives"
condition="dir">
- <h2 class="details-section">Subdirectives</h2>
+ <h2 class="details-section" i18n:translate="">Subdirectives</h2>
<div class="indent"
tal:repeat="dir view/getSubdirectives">
@@ -89,7 +90,7 @@
<div class="indent"
tal:condition="dir/handler">
- <i>Handler:</i>
+ <i i18n:translate="">Handler:</i>
<a href=""
tal:attributes="href
string:../../../Class/${dir/handler/url}/index.html"
@@ -131,7 +132,7 @@
</ul>
<p tal:condition="not: fields">
- <em>There are no fields specified.</em>
+ <em i18n:translate="">There are no fields specified.</em>
</p>
</div>
@@ -141,4 +142,4 @@
</tal:omit-tag>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: Zope3/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt 2004-05-24 11:07:32 UTC (rev 24919)
+++ Zope3/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt 2004-05-24 12:16:38 UTC (rev 24920)
@@ -1,9 +1,9 @@
<html metal:use-macro="views/apidoc_macros/menu">
<body>
- <p metal:fill-slot="pre_menu" class="small">
+ <p metal:fill-slot="pre_menu" class="small" i18n:translate="">
Namespaces that are not full URLs start with "http://namespaces.zope.org".
</p>
</body>
-</html>
\ No newline at end of file
+</html>
More information about the Zope3-Checkins
mailing list