[Zope3-checkins] CVS: Zope3/src/zope/tal/tests/input - test11.html:1.3

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/tal/tests/input
In directory cvs.zope.org:/tmp/cvs-serv6527/tests/input

Modified Files:
	test11.html 
Log Message:
Merge fixes from srichter-i18n-macro-interaction-branch:
- fix handling of nested translations with tal:content/replace and i18n:name
- port fix for #539 in collector from Zope 2.x (onerror)
- added relevant tests
- minor refactoring, added comments, and cleanup

Thanks go to Stephan Richter and Godefroid Chapelle for identifying
and fixing these corner cases.


=== Zope3/src/zope/tal/tests/input/test11.html 1.2 => 1.3 ===
--- Zope3/src/zope/tal/tests/input/test11.html:1.2	Wed Dec 25 09:15:31 2002
+++ Zope3/src/zope/tal/tests/input/test11.html	Thu Aug 14 13:23:24 2003
@@ -11,4 +11,9 @@
   <p tal:on-error="string:x undefined">
     <span tal:content="x"/>
   </p>
+  <tal:block on-error="string:x undefined" replace="x" />
+  <tal:block on-error="string:x undefined">
+  <p tal:content="x">p</p>
+  </tal:block>
+  <div tal:replace="structure string:&lt;hr /&gt;">rule</div>
 </html>