[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Removed all cases of bogus use 'i18n:translate'

Dmitry Vasiliev dima at hlabs.spb.ru
Thu May 5 08:53:54 EDT 2005


Log message for revision 30249:
  Removed all cases of bogus use 'i18n:translate'
  

Changed:
  U   Zope3/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt
  U   Zope3/trunk/src/zope/app/cache/browser/cacheableedit.pt
  U   Zope3/trunk/src/zope/app/cache/browser/ramedit.pt
  U   Zope3/trunk/src/zope/app/cache/browser/ramstats.pt
  U   Zope3/trunk/src/zope/app/component/browser/site_management.pt
  U   Zope3/trunk/src/zope/app/container/browser/commontasks.pt
  U   Zope3/trunk/src/zope/app/dublincore/browser/edit.pt
  U   Zope3/trunk/src/zope/app/file/browser/image_edit.pt
  U   Zope3/trunk/src/zope/app/rotterdam/template.pt
  U   Zope3/trunk/src/zope/app/rotterdam/template_tablelayout.pt
  U   Zope3/trunk/src/zope/app/rotterdam/view_macros.pt
  U   Zope3/trunk/src/zope/app/securitypolicy/browser/manage_access.pt
  U   Zope3/trunk/src/zope/app/zopetop/widget_macros.pt

-=-
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -105,7 +105,8 @@
 
   <h4>
     <metal:block use-macro="context/@@apidoc_macros/displaySwitch" />
-    <span i18n:translate=""><span tal:replace="name" /> Views</span>
+    <span i18n:translate=""><span i18n:name="name" tal:replace="name"
+        /> Views</span>
   </h4>
   <metal:block use-macro="context/@@apidoc_macros/display" >
   <div metal:fill-slot="content">
@@ -122,7 +123,7 @@
 
   <h3 class="details-section">
     <metal:block use-macro="context/@@apidoc_macros/displaySwitch" />
-    <span i18n:translate="" tal:content="type">Browser</span>
+    <span tal:content="type">Browser</span>
   </h3>
   <metal:block use-macro="context/@@apidoc_macros/display" >
   <div class="indent" metal:fill-slot="content">

Modified: Zope3/trunk/src/zope/app/cache/browser/cacheableedit.pt
===================================================================
--- Zope3/trunk/src/zope/app/cache/browser/cacheableedit.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/cache/browser/cacheableedit.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -50,7 +50,7 @@
              i18n:attributes="value invalidate-cache-button" />
 
     </form>
-    <div tal:content="options/message|nothing" i18n:translate="" />
+    <div tal:content="options/message|nothing" />
 
   </div>
   </body>

Modified: Zope3/trunk/src/zope/app/cache/browser/ramedit.pt
===================================================================
--- Zope3/trunk/src/zope/app/cache/browser/ramedit.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/cache/browser/ramedit.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -53,7 +53,7 @@
            i18n:attributes="value save-changes-button" />
     <input type="reset" value="Reset" i18n:attributes="value reset-button" />
   </form>
-  <div tal:content="options/message|nothing" i18n:translate=""/>
+  <div tal:content="options/message|nothing" />
 
 </div>
 </body>

Modified: Zope3/trunk/src/zope/app/cache/browser/ramstats.pt
===================================================================
--- Zope3/trunk/src/zope/app/cache/browser/ramstats.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/cache/browser/ramstats.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -35,7 +35,7 @@
     </tbody>
   </table>
 
-  <div tal:content="options/message|nothing" i18n:translate=""/>
+  <div tal:content="options/message|nothing" />
 </div>
 </body>
 

Modified: Zope3/trunk/src/zope/app/component/browser/site_management.pt
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/site_management.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/component/browser/site_management.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -10,7 +10,7 @@
   <div class="message"
        tal:define="message view/update"
        tal:condition="message"
-       tal:content="message"  i18n:translate="">
+       tal:content="message">
     Status Message
   </div>
 

Modified: Zope3/trunk/src/zope/app/container/browser/commontasks.pt
===================================================================
--- Zope3/trunk/src/zope/app/container/browser/commontasks.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/container/browser/commontasks.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -2,12 +2,12 @@
            condition="addingInfo" i18n:domain="zope">
 
   <tal:block repeat="info addingInfo"
-	define="namesRequired context/@@+/nameAllowed">
+    define="namesRequired context/@@+/nameAllowed">
     <div tal:define="oddrow repeat/info/odd;
-		     namesRequired context/@@+/nameAllowed;
+        namesRequired context/@@+/nameAllowed;
         has_custom_add_view python:'has_custom_add_view' in info"
-      	tal:attributes="class python:oddrow and 'content even' or 'content odd'"
-	class="even">
+        tal:attributes="class python:oddrow and 'content even' or 'content odd'"
+        class="even">
       <a href="#"
         tal:define="baseurl python:request.getURL(1)"
         tal:condition="python: not info['action'].startswith('../')
@@ -15,17 +15,17 @@
         tal:attributes="
           href string:${baseurl}/@@contents.html?type_name=${info/action};
           class info/selected"
-        tal:content="info/title" i18n:translate="">Folder
+        tal:content="info/title">Folder
       </a>
 
       <a href="#"
         tal:define="baseurl python:request.getURL(1)"
         tal:condition="python: not info['action'].startswith('../')
-		               and (has_custom_add_view or not namesRequired)"
+                   and (has_custom_add_view or not namesRequired)"
         tal:attributes="
           href string:${baseurl}/@@+/action.html?type_name=${info/action};
           class info/selected"
-        tal:content="info/title" i18n:translate="">Folder
+        tal:content="info/title">Folder
       </a>
 
       <a href="#"
@@ -34,7 +34,7 @@
         tal:attributes="
           href python: info['action'][3:];
           class info/selected"
-        tal:content="info/title" i18n:translate="">Folder
+        tal:content="info/title">Folder
       </a>
     </div>
   </tal:block>

Modified: Zope3/trunk/src/zope/app/dublincore/browser/edit.pt
===================================================================
--- Zope3/trunk/src/zope/app/dublincore/browser/edit.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/dublincore/browser/edit.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -11,7 +11,7 @@
 
     <p tal:condition="data/message"
        tal:content="data/message" 
-       i18n:translate="">Message here</p>
+       >Message here</p>
 
     <div class="row">
       <div class="label" i18n:translate="">Title</div>

Modified: Zope3/trunk/src/zope/app/file/browser/image_edit.pt
===================================================================
--- Zope3/trunk/src/zope/app/file/browser/image_edit.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/file/browser/image_edit.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -10,8 +10,7 @@
     <table metal:fill-slot="extra_top">
       <tr>
         <td i18n:translate="">Size</td>
-        <td tal:content="view/size" i18n:translate=""
-           >103 x 45 pixels, 43KB</td>            
+        <td tal:content="view/size">103 x 45 pixels, 43KB</td>            
       </tr>
     </table>
 

Modified: Zope3/trunk/src/zope/app/rotterdam/template.pt
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/template.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/rotterdam/template.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -112,8 +112,7 @@
           <a href=""
             tal:attributes="href view/action;
                             class view/selected;"
-            tal:content="view/title"
-            i18n:translate="">
+            tal:content="view/title">
             label
           </a>
         </tal:block>
@@ -131,8 +130,7 @@
 					><a href="#"
                tal:repeat="info actions"
                tal:attributes="href info/action"
-               tal:content="info/title"
-               i18n:translate="">
+               tal:content="info/title">
               Action name
           </a></span
 				><span tal:condition="help_actions"
@@ -153,8 +151,7 @@
                                            + url + ','
                                            + name + ','
                                            + settings +')'"
-               tal:content="help_info/title"
-               i18n:translate="">
+               tal:content="help_info/title">
               Action name
           </a></span>
       </div>

Modified: Zope3/trunk/src/zope/app/rotterdam/template_tablelayout.pt
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/template_tablelayout.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/rotterdam/template_tablelayout.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -113,8 +113,7 @@
                             <a href=""
                                 tal:attributes="href view/action;
                                                                 class view/selected;"
-                                tal:content="view/title"
-                                i18n:translate="">
+                                tal:content="view/title">
                                 label
                             </a>
                         </tal:block>
@@ -130,8 +129,7 @@
                             <li tal:condition="actions" tal:repeat="info actions"
                                 ><a href="#"
                                          tal:attributes="href info/action"
-                                         tal:content="info/title"
-                                         i18n:translate="">
+                                         tal:content="info/title">
                                         Action name
                                 </a></li>
                             <li tal:condition="help_actions" tal:repeat="help_info help_actions"
@@ -150,8 +148,7 @@
                                                                                              + url + ','
                                                                                              + name + ','
                                                                                              + settings +')'"
-                                     tal:content="help_info/title"
-                                     i18n:translate="">
+                                     tal:content="help_info/title">
                                     Action name
                                 </a></li>
                         </ul>

Modified: Zope3/trunk/src/zope/app/rotterdam/view_macros.pt
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/view_macros.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/rotterdam/view_macros.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -5,7 +5,6 @@
   <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"
@@ -22,7 +21,7 @@
   <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"
-       i18n:translate="">label</a>
+       >label</a>
     <tal:block condition="not: repeat/view/end">'</tal:block>
     </td>
    </tr></table>
@@ -33,7 +32,7 @@
 
   <div metal:define-macro="logged_user">
     <p i18n:translate="">User: 
-      <span tal:replace="request/principal/title">User</span>
+      <span i18n:name="user" tal:replace="request/principal/title">User</span>
     </p>
   </div>
 

Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/manage_access.pt
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/manage_access.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/manage_access.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -40,7 +40,6 @@
         <td align="center" tal:repeat="role view/roles">
           <div class="list-item">
             <a href="RolePermissions.html"
-              i18n:translate=""
               tal:attributes="
               href string:RolePermissions.html?role_to_manage=${role/id}" 
               tal:content="role/title">Anonymous</a>
@@ -60,7 +59,6 @@
         <td align="left" nowrap="nowrap">
           <div class="list-item">
              <a href="RolesWithPermission.html"
-                i18n:translate=""
                 tal:attributes="href 
            string:RolesWithPermission.html?permission_to_manage=${perm/id}"
                 tal:content="perm/title"

Modified: Zope3/trunk/src/zope/app/zopetop/widget_macros.pt
===================================================================
--- Zope3/trunk/src/zope/app/zopetop/widget_macros.pt	2005-05-05 10:46:49 UTC (rev 30248)
+++ Zope3/trunk/src/zope/app/zopetop/widget_macros.pt	2005-05-05 12:53:53 UTC (rev 30249)
@@ -210,8 +210,7 @@
         <a href=""
            tal:attributes="href view/action;
                            class view/selected;"
-           tal:content="view/title"
-           i18n:translate="">
+           tal:content="view/title">
           label
         </a>
       </tal:block>
@@ -225,8 +224,7 @@
         <a href="#"
            tal:repeat="info actions"
            tal:attributes="href info/action"
-           tal:content="info/title"
-           i18n:translate="">
+           tal:content="info/title">
           Action name
         </a>
       </span>



More information about the Zope3-Checkins mailing list