[ZPT] CVS: Zope/lib/python/Products/PageTemplates/tests/input - CheckI18nTranslate.html:1.2.2.2 CheckI18nTranslateHooked.html:1.2.2.2 StringExpression.html:1.1.112.1

Chris McDonough chrism@zope.com
Tue, 8 Oct 2002 14:41:39 -0400 

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv20268/lib/python/Products/PageTemplates/tests/input

Modified Files:
      Tag: chrism-install-branch
	CheckI18nTranslate.html CheckI18nTranslateHooked.html 
	StringExpression.html 
Log Message:
Merging HEAD into chrism-install-branch.


=== Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslate.html 1.2.2.1 => 1.2.2.2 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslate.html:1.2.2.1	Sat Sep 28 21:40:33 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslate.html	Tue Oct  8 14:41:08 2002
@@ -1,7 +1,12 @@
 <html>
 <body>
 <head>
-   <p i18n:translate="foobar">baz</p>
+   <p i18n:domain="foo" i18n:translate="bar">baz</p>
+   <a href="foo" alt="alttext" i18n:attributes="alt">link</a>
+   <p i18n:domain="dom" i18n:translate="">
+     <span tal:replace="string:Lomax" i18n:name="name" /> was born in
+     <span tal:replace="string:Antarctica" i18n:name="country" />.
+   </p>
 </head>
 </body>
 </html>


=== Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslateHooked.html 1.2.2.1 => 1.2.2.2 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslateHooked.html:1.2.2.1	Sat Sep 28 21:40:33 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/CheckI18nTranslateHooked.html	Tue Oct  8 14:41:08 2002
@@ -2,6 +2,11 @@
 <body>
 <head>
    <p i18n:domain="foo" i18n:translate="bar">baz</p>
+   <a href="foo" alt="alttext" i18n:attributes="alt">link</a>
+   <p i18n:domain="dom" i18n:translate="">
+     <span tal:replace="string:Lomax" i18n:name="name" /> was born in
+     <span tal:replace="string:Antarctica" i18n:name="country" />.
+   </p>
 </head>
 </body>
 </html>


=== Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html 1.1 => 1.1.112.1 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html:1.1	Mon Mar 26 15:32:53 2001
+++ Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html	Tue Oct  8 14:41:08 2002
@@ -1,7 +1,12 @@
 <html>
-<body>
 <head>
    <title tal:content="string:Hello World!">This is the title</title>
 </head>
+<body>
+  <tal:block on-error="string:Error:${error/value}" replace="x" />
+  <tal:block on-error="string:Error:${error/value}">
+    <p tal:content="x">p</p>
+  </tal:block>
+  <div tal:replace="structure string:&lt;hr /&gt;">rule</div>
 </body>
 </html>