[Zope-Checkins] CVS: Zope/lib/python/TAL/tests/input - 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.5

Fri Aug 15 10:59:25 EDT 2003

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

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/input/test29.html 1.1 => 1.2 ===

--- /dev/null	Fri Aug 15 09:59:24 2003
+++ Zope/lib/python/TAL/tests/input/test29.html	Fri Aug 15 09:58:47 2003
@@ -0,0 +1,4 @@
+<div i18n:translate="">At the tone the time will be
+<span i18n:data="here/currentTime"
+      i18n:translate="timefmt"
+      i18n:name="time">2:32 pm</span>... beep!</div>


=== Zope/lib/python/TAL/tests/input/test_metal4.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:59:24 2003
+++ Zope/lib/python/TAL/tests/input/test_metal4.html	Fri Aug 15 09:58:47 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/input/test_metal5.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:59:24 2003
+++ Zope/lib/python/TAL/tests/input/test_metal5.html	Fri Aug 15 09:58:47 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/input/test_metal6.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:59:24 2003
+++ Zope/lib/python/TAL/tests/input/test_metal6.html	Fri Aug 15 09:58:47 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/input/test_metal7.html 1.1 => 1.2 ===
--- /dev/null	Fri Aug 15 09:59:24 2003
+++ Zope/lib/python/TAL/tests/input/test_metal7.html	Fri Aug 15 09:58:47 2003
@@ -0,0 +1,4 @@
+<html metal:define-macro="page" i18n:domain="zope">
+    <x metal:define-slot="title" />
+</html>
+<html metal:use-macro="page" />
\ No newline at end of file


=== Zope/lib/python/TAL/tests/input/test_metal1.html 1.4 => 1.5 ===
--- Zope/lib/python/TAL/tests/input/test_metal1.html:1.4	Mon Oct 28 15:43:10 2002
+++ Zope/lib/python/TAL/tests/input/test_metal1.html	Fri Aug 15 09:58:47 2003
@@ -54,7 +54,7 @@
 
 <xxx metal:use-macro="INNER3">
   <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>
 </xxx>
 


