[Po4a-commits] "po4a/t/data-25 includessi.html, NONE, 1.1 includessi.po, NONE, 1.1 includessi_normalized.html, NONE, 1.1 xhtml.po, 1.5, 1.6 xhtml_normalized.html, 1.4, 1.5"
Nicolas FRANCOIS
nekral-guest at alioth.debian.org
Sat Mar 15 01:20:04 UTC 2008
Update of /cvsroot/po4a/po4a/t/data-25
In directory alioth:/tmp/cvs-serv3993/t/data-25
Modified Files:
xhtml.po xhtml_normalized.html
Added Files:
includessi.html includessi.po includessi_normalized.html
Log Message:
* lib/Locale/Po4a/Xml.pm: Do not translate the SSI comments by
default (<!--#...-->). Set the f_extract and f_translate to the
same as for regular comments.
* lib/Locale/Po4a/Xml.pm: Do not forget the # at the beginning of
SSI comments.
* t/25-xhtml.t, t/data-25/includessi.html, t/data-25/includessi.po,
t/data-25/includessi_normalized.html, MANIFEST: Added tests for the
includessi option.
* t/data-25/xhtml.po, t/data-25/xhtml_normalized.html: SSI
comments are no more translated.
--- NEW FILE: includessi_normalized.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<!--#set var="BLAH" value="1" --> <!--#include virtual="header.shtml"-->
<title>Title string</title>
</head>
<body>
<div class="content">
<h1>Header</h1>
<img src="somepicture.jpg" class="left"
alt="Some text" title="My picture" />
<p><strong>Strong</strong>not strong</p>
<p><strong>Another line</strong> with space and no closing.</p>
<p>
<a href="somelink.html">My link</a>, <a href="nextline.html">link on next
line</a>, <a href="sameline.html">line on same line</a>.
</p>
<img src="picture.jpg" alt="picture" />
and some text without a paragraph mark.
</div>
<div class="content">
<p>A paragraph with an <!--#include virtual="header.shtml"--> SSI statement
inside</p>
</div>
</body>
</html>
Index: xhtml_normalized.html
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-25/xhtml_normalized.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xhtml_normalized.html 2 Mar 2008 01:02:17 -0000 1.4
+++ xhtml_normalized.html 15 Mar 2008 01:20:00 -0000 1.5
@@ -3,8 +3,11 @@
<html>
<head>
- <!--#set var="BLAH" value="1" --> <!--#include virtual="header.shtml"-->
- <title>Title string</title>
+
+
+ <!--#set var="BLAH" value="1" -->
+<!--#include virtual="header.shtml"-->
+<title>Title string</title>
</head>
<body>
@@ -25,8 +28,8 @@
and some text without a paragraph mark.
</div>
<div class="content">
- <p>A paragraph with an <!--#include virtual="header.shtml"--> SSI statement
-inside</p>
+ <p><!--#include virtual="header.shtml"-->
+A paragraph with an SSI statement inside</p>
</div>
</body>
</html>
Index: xhtml.po
===================================================================
RCS file: /cvsroot/po4a/po4a/t/data-25/xhtml.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xhtml.po 2 Mar 2008 01:02:17 -0000 1.5
+++ xhtml.po 15 Mar 2008 01:20:00 -0000 1.6
@@ -15,13 +15,6 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING"
-# type: Content of: <html><head>
-#: ../data-25/xhtml.html:6
-msgid ""
-"<!--#set var=\"BLAH\" value=\"1\" --> <!--#include "
-"virtual=\"header.shtml\"-->"
-msgstr ""
-
# type: Content of: <html><head><title>
#: ../data-25/xhtml.html:8
msgid "Title string"
@@ -69,9 +62,8 @@
msgid "and some text without a paragraph mark."
msgstr ""
+#. #include virtual="header.shtml"
# type: Content of: <html><body><div><p>
#: ../data-25/xhtml.html:29
-msgid ""
-"A paragraph with an <!--#include virtual=\"header.shtml\"--> SSI statement "
-"inside"
+msgid "A paragraph with an SSI statement inside"
msgstr ""
--- NEW FILE: includessi.po ---
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2008-03-15 01:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING"
# type: Content of: <html><head>
#: ../data-25/includessi.html:6
msgid ""
"<!--#set var=\"BLAH\" value=\"1\" --> <!--#include "
"virtual=\"header.shtml\"-->"
msgstr ""
# type: Content of: <html><head><title>
#: ../data-25/includessi.html:8
msgid "Title string"
msgstr ""
# type: Content of: <html><body><div><h1>
#: ../data-25/includessi.html:13
msgid "Header"
msgstr ""
# type: Attribute 'alt' of: <html><body><div><img>
#: ../data-25/includessi.html:15
msgid "Some text"
msgstr ""
# type: Attribute 'title' of: <html><body><div><img>
#: ../data-25/includessi.html:15
msgid "My picture"
msgstr ""
# type: Content of: <html><body><div><p>
#: ../data-25/includessi.html:17
msgid "<strong>Strong</strong>not strong"
msgstr ""
# type: Content of: <html><body><div><p>
#: ../data-25/includessi.html:18
msgid "<strong>Another line</strong> with space and no closing."
msgstr ""
# type: Content of: <html><body><div><p>
#: ../data-25/includessi.html:20
msgid ""
"<a href=\"somelink.html\">My link</a>, <a href=\"nextline.html\">link on "
"next line</a>, <a href=\"sameline.html\">line on same line</a>."
msgstr ""
# type: Attribute 'alt' of: <html><body><div><img>
#: ../data-25/includessi.html:24
msgid "picture"
msgstr ""
# type: Content of: <html><body><div>
#: ../data-25/includessi.html:26
msgid "and some text without a paragraph mark."
msgstr ""
# type: Content of: <html><body><div><p>
#: ../data-25/includessi.html:29
msgid ""
"A paragraph with an <!--#include virtual=\"header.shtml\"--> SSI statement "
"inside"
msgstr ""
--- NEW FILE: includessi.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<!--#set var="BLAH" value="1" -->
<!--#include virtual="header.shtml"-->
<title>Title string</title>
</head>
<body>
<div class="content">
<h1>Header</h1>
<img src="somepicture.jpg" class="left"
alt="Some text" title="My picture" />
<p><strong>Strong</strong>not strong</p>
<p><strong>Another line</strong> with space and no closing.</p>
<p>
<a href="somelink.html">My link</a>,
<a href="nextline.html">link on next line</a>, <a href="sameline.html">line on same line</a>.
</p>
<img src="picture.jpg" alt="picture" />
and some text without a paragraph mark.
</div>
<div class="content">
<p>A paragraph with an
<!--#include virtual="header.shtml"-->
SSI statement inside</p>
</div>
</body>
</html>
More information about the Po4a-commits
mailing list