[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - standard_error_message.pt:1.7

Thu, 6 Mar 2003 05:34:34 -0500

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv11537/CMFDefault/skins/zpt_generic

Modified Files:
	standard_error_message.pt 
Log Message:
Merged yuppie-collector122-branch:
- Added i18n attributes. (Collector #122)
- Made scripts independent of submit button values.
- Added transition_form.

=== CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt 1.6 => 1.7 ===

--- CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt:1.6	Thu Aug  1 15:57:45 2002
+++ CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt	Thu Mar  6 05:34:33 2003
@@ -2,56 +2,63 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
- 
+
 
 <div tal:condition="options/error_message"
      tal:content="structure options/error_message" />
 
 <div tal:condition="not: options/error_message">
-  <h2>Site Error</h2>
+  <h2 i18n:translate="">Site Error</h2>
+
+  <p i18n:translate="">An error was encountered while publishing this
+   resource.</p>
 
-  <p>An error was encountered while publishing this resource.</p>
-  
-  <p> <strong>Error Type:
-        <span tal:replace="options/error_type" />
-      </strong>
-  <br><strong>Error Value:
-      <span tal:replace="options/error_value" /></strong>
-  <br> 
+  <p>
+    <strong i18n:translate="">Error Type:
+      <span tal:replace="options/error_type" i18n:name="error_type" />
+    </strong>
+    <br />
+    <strong i18n:translate="">Error Value:
+      <span tal:replace="options/error_value" i18n:name="error_value" />
+    </strong>
+    <br />
   </p>
- 
+
   <hr noshade />
- 
-  <p>Troubleshooting Suggestions</p>
+
+  <p i18n:translate="">Troubleshooting Suggestions</p>
 
   <ul>
   <div tal:condition="python: options['error_type'] in ('KeyError'
                                                        ,'NameError')">
-  <li>This resource may be trying to reference a
+  <li i18n:translate="">This resource may be trying to reference a
       nonexistent object or variable
-      <strong><span tal:replace="options/error_value" /></strong>.</li>
+      <strong><span tal:replace="options/error_value"
+                    i18n:name="error_value" /></strong>.</li>
   </div>
-  <li>The URL may be incorrect.</li>
-  <li>The parameters passed to this resource may be incorrect.</li>
-  <li>A resource that this resource relies on may be encountering
-      an error.</li>
+  <li i18n:translate="">The URL may be incorrect.</li>
+  <li i18n:translate="">The parameters passed to this resource may be
+    incorrect.</li>
+  <li i18n:translate="">A resource that this resource relies on may be
+    encountering an error.</li>
   </ul>
 
-  <p>For more detailed information about the error, please
+  <p i18n:translate="">For more detailed information about the error, please
   refer to the HTML source for this page.
   </p>
 
-  <p>If the error persists please contact the site maintainer.
-  Thank you for your patience.
+  <p i18n:translate="">If the error persists please contact the site
+    maintainer. Thank you for your patience.
   </p>
 
 </div>
 
 <div tal:condition="options/error_log_url | nothing">
   <hr noshade />
-  <a href="error_log_url" tal:attributes="href options/error_log_url">
+  <a href="error_log_url" tal:attributes="href options/error_log_url"
+     i18n:translate="">
     Show Error Log Entry
   </a>
 </div>



