[Zope-Checkins] CVS: Zope/lib/python/TAL/tests/output - test29.html:1.2 test_metal4.html:1.2 test_metal5.html:1.2 test_metal6.html:1.2 test_metal7.html:1.2 test_metal1.html:1.6

Fri Aug 15 10:59:01 EDT 2003

Update of /cvs-repository/Zope/lib/python/TAL/tests/output
In directory cvs.zope.org:/tmp/cvs-serv11232/tests/output

Modified Files:
	test_metal1.html 
Added Files:
	test29.html test_metal4.html test_metal5.html test_metal6.html 
	test_metal7.html 
Log Message:
merge from gotcha-talz3_backport-branch

backport of TAL fixes from z3

- i18n and metal interactions

- fix handling of nested translations with tal:content/replace and i18n:name

some reformatting to ease comparisons between 2.x and 3



=== Zope/lib/python/TAL/tests/output/test29.html 1.1 => 1.2 ===

--- /dev/null	Fri Aug 15 09:58:58 2003
+++ Zope/lib/python/TAL/tests/output/test29.html	Fri Aug 15 09:58:52 2003
@@ -0,0 +1 @@
+<div>AT THE TONE THE TIME WILL BE 59 MINUTES AFTER 6 PM... BEEP!</div>


=== Zope/lib/python/TAL/tests/output/test_metal4.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:58:58 2003
+++ Zope/lib/python/TAL/tests/output/test_metal4.html	Fri Aug 15 09:58:52 2003
@@ -0,0 +1,4 @@
+<!-- the outer element *must* be tal:something or metal:something -->
+<metal:block define-macro="page" i18n:domain="zope">
+  <title metal:define-slot="title">Z3 UI</title>
+</metal:block>


=== Zope/lib/python/TAL/tests/output/test_metal5.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:58:58 2003
+++ Zope/lib/python/TAL/tests/output/test_metal5.html	Fri Aug 15 09:58:52 2003
@@ -0,0 +1,4 @@
+<!-- the outer element *must* include tal:omit-tag='' -->
+<x tal:omit-tag="" metal:define-macro="page" i18n:domain="zope">
+  <title metal:define-slot="title">Z3 UI</title>
+</x>


=== Zope/lib/python/TAL/tests/output/test_metal6.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:58:59 2003
+++ Zope/lib/python/TAL/tests/output/test_metal6.html	Fri Aug 15 09:58:52 2003
@@ -0,0 +1,5 @@
+<metal:block define-macro="page">
+  <html i18:domain="zope">
+     <metal:block define-slot="title">Z3 UI</metal:block>
+  </html>
+</metal:block>


=== Zope/lib/python/TAL/tests/output/test_metal7.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:58:59 2003
+++ Zope/lib/python/TAL/tests/output/test_metal7.html	Fri Aug 15 09:58:52 2003
@@ -0,0 +1,6 @@
+<html metal:define-macro="page" i18n:domain="zope">
+    <x metal:define-slot="title" />
+</html>
+<html metal:use-macro="page" i18n:domain="zope">
+    <x metal:fill-slot="title" />
+</html>


=== Zope/lib/python/TAL/tests/output/test_metal1.html 1.5 => 1.6 ===
--- Zope/lib/python/TAL/tests/output/test_metal1.html:1.5	Mon Oct 28 15:43:11 2002
+++ Zope/lib/python/TAL/tests/output/test_metal1.html	Fri Aug 15 09:58:52 2003
@@ -22,7 +22,7 @@
 
 <span metal:use-macro="OUTER2">
   AAA
-  <xxx metal:slot="OUTERSLOT">
+  <xxx metal:fill-slot="OUTERSLOT">
   <span>INNER</span>
   </xxx>
   BBB
@@ -48,7 +48,7 @@
 
 <span metal:use-macro="OUTER3">
   AAA
-  <xxx metal:slot="OUTERSLOT">
+  <xxx metal:fill-slot="OUTERSLOT">
   <span>INNER
     <xxx>INNERSLOT</xxx>
   </span>
@@ -63,7 +63,7 @@
 </span>
 
 <span metal:use-macro="INNER3">INNER
-    <xxx metal:slot="INNERSLOT">INNERSLOT</xxx>
+    <xxx metal:fill-slot="INNERSLOT">INNERSLOT</xxx>
   </span>
 
 <span metal:use-macro="INNER3">INNER
@@ -72,8 +72,8 @@
 
 <span metal:use-macro="INNER3">INNER
     <yyy metal:fill-slot="INNERSLOT">
-    <zzz metal:define-macro="INSLOT"><aaa metal:slot="null">INSLOT</aaa></zzz>
+    <zzz metal:define-macro="INSLOT">INSLOT</zzz>
   </yyy>
   </span>
 
-<zzz metal:use-macro="INSLOT"><aaa>INSLOT</aaa></zzz>
+<zzz metal:use-macro="INSLOT">INSLOT</zzz>


