[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ I18n updated

[Dmitry Vasiliev]

Log message for revision 25171:
I18n updated



-=-
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/browser.py	2004-06-02 08:16:29 UTC (rev 25170)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/browser.py	2004-06-02 09:11:55 UTC (rev 25171)
@@ -23,6 +23,7 @@
 from zope.schema.interfaces import IField
 
 from zope.app import zapi
+from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.apidoc.utilities import getPythonPath, stx2html
 from zope.app.apidoc.classmodule import classRegistry
 
@@ -147,16 +148,16 @@
 
       >>> field = Field()
       >>> _getRequired(field)
-      'optional'
+      u'optional'
       >>> field.required = True
       >>> _getRequired(field)
-      'required'
+      u'required'
 
     """
     if field.required:
-        return 'required'
+        return _('required')
     else:
-        return 'optional'
+        return _('optional')
 
 
 def _getRealFactory(factory):
@@ -305,13 +306,13 @@
              [('id', 'zope.schema.interfaces.ITextLine'),
               ('name', 'ITextLine')]),
             ('name', 'title'),
-            ('required', 'required')],
+            ('required', u'required')],
            [('default', "u'Foo.'"),
             ('description', u'Desc'),
             ('iface',
              [('id', 'zope.schema.interfaces.IText'), ('name', 'IText')]),
             ('name', 'description'),
-            ('required', 'optional')]]
+            ('required', u'optional')]]
         """
         fields = map(lambda x: x[1], _getInOrder(self.context, IField))
         return [{'name': field.getName(),

Modified: Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt	2004-06-02 08:16:29 UTC (rev 25170)
+++ Zope3/trunk/src/zope/app/apidoc/zcmlmodule/index.pt	2004-06-02 09:11:55 UTC (rev 25171)
@@ -12,10 +12,10 @@
        tal:condition="info">
     <i i18n:translate="">File:</i>
     <tal:var replace="info/file" />
-    <tal:block i18n:translate="">
+    <tal:block i18n:translate="">from
       (line <tal:var replace="info/line" i18n:name="beginline" />,
-      column <tal:var replace="info/column" i18n:name="begincolumn" /> to
-      line <tal:var replace="info/eline" i18n:name="endline" />,
+      column <tal:var replace="info/column" i18n:name="begincolumn" />) to
+      (line <tal:var replace="info/eline" i18n:name="endline" />,
       column <tal:var replace="info/ecolumn" i18n:name="endcolumn" />)
     </tal:block>
   </div>
@@ -65,7 +65,8 @@
                string:../../../Interface/${field/iface/id}/apiindex.html">
           <code tal:content="field/iface/name">IField</code></a>
       (<span tal:content="string:${field/required}, ">optional, </span>
-        default = <code tal:content="field/default" />)<br>
+        <span i18n:translate="">default</span> =
+            <code tal:content="field/default" />)<br>
       <span tal:content="field/description">field desc</span>      
     </li>
 

Modified: Zope3/trunk/src/zope/app/session/browser.zcml
===================================================================
--- Zope3/trunk/src/zope/app/session/browser.zcml	2004-06-02 08:16:29 UTC (rev 25170)
+++ Zope3/trunk/src/zope/app/session/browser.zcml	2004-06-02 09:11:55 UTC (rev 25171)
@@ -1,6 +1,7 @@
 <configure 
   xmlns:zope="http://namespaces.zope.org/zope"
-  xmlns="http://namespaces.zope.org/browser">
+  xmlns="http://namespaces.zope.org/browser"
+  i18n_domain="zope">
 
   <!-- Cookie Browser Id Manager -->