[Zope-Checkins] CVS: Zope/lib/python/TAL/tests/input - test29.html:1.2.2.1 test_metal4.html:1.2.2.1 test_metal5.html:1.2.2.1 test_metal6.html:1.2.2.1 test_metal7.html:1.2.2.1 test_metal1.html:1.4.34.1

Fri Aug 15 11:15:21 EDT 2003

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

Modified Files:
      Tag: Zope-2_7-branch
	test_metal1.html 
Added Files:
      Tag: Zope-2_7-branch
	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



=== Added File Zope/lib/python/TAL/tests/input/test29.html ===
<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>


=== Added File Zope/lib/python/TAL/tests/input/test_metal4.html ===

<metal:block define-macro="page" i18n:domain="zope">
  <title metal:define-slot="title">Z3 UI</title>
</metal:block>


=== Added File Zope/lib/python/TAL/tests/input/test_metal5.html ===

<x tal:omit-tag="" metal:define-macro="page" i18n:domain="zope">
  <title metal:define-slot="title">Z3 UI</title>
</x>


=== Added File Zope/lib/python/TAL/tests/input/test_metal6.html ===
<metal:block define-macro="page">
  <html i18:domain="zope">
     <metal:block define-slot="title">Z3 UI</metal:block>
  </html>
</metal:block>


=== Added File Zope/lib/python/TAL/tests/input/test_metal7.html ===
<html metal:define-macro="page" i18n:domain="zope">
    <x metal:define-slot="title" />
</html>
<html metal:use-macro="page" />

=== Zope/lib/python/TAL/tests/input/test_metal1.html 1.4 => 1.4.34.1 ===

--- 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 10:14:44 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>
 


