From 801479f0d761035a7339bb6d49e6783f3e187641 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9rick=20Capovilla?= Date: Wed, 2 Nov 2011 10:56:33 -0400 Subject: [PATCH] Fix a problem when translations contain   various XSL files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit With new 3.6.1 translation files, the lake of 'nbsp' entity definition make fail t/00-valid-xml.t test. This patch applies to HEAD and 3.6.x. How to test: - checkout 3.6.x branch - generate French templates: cd misc/translator ./translate install fr-FR cd ../.. - run test: prove -v t/00-valid-xml.t you get failing error message - apply this patch - run test again: it passes Signed-off-by: Frédéric Demians http://bugs.koha-community.org/show_bug.cgi?id=7141 (cherry picked from commit 7534c34cdb272987122ef106e9d4523f10ff178e) Signed-off-by: Chris Nighswonger --- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl | 3 ++- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl | 5 ++++- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl | 3 ++- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 | 5 ++++- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl | 5 ++++- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl | 3 ++- koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl | 5 ++++- koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl | 4 +++- koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl | 2 ++ koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl | 1 + koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl | 1 + .../opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl | 3 ++- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 + koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl | 3 +++ koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl | 3 +++ koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 1 + koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl | 4 +++- 27 files changed, 60 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl index e706763b41..2d6d5ba4b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl @@ -1,4 +1,7 @@ + +]> + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl index 2b038c9e73..2ba9cf1e9c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl @@ -1,4 +1,5 @@ +]> +]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl index e78a888830..a4ac1b2153 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl @@ -1,4 +1,5 @@ +]> @@ -2518,4 +2519,4 @@ Added Log Comment ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl index 54cda253b4..e040c76252 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl @@ -1,4 +1,5 @@ +]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl index 13b25b4a93..a4cd457bf8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl @@ -1,3 +1,4 @@ +]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl index 60975e01e3..289bde77b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl @@ -1,4 +1,7 @@ + +]> + @@ -197,4 +200,4 @@ ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl index 23ffe7c84d..b888431442 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl @@ -1,4 +1,5 @@ +]> @@ -194,4 +195,4 @@ ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 index b78e860328..00201a79c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 @@ -1,4 +1,7 @@ + +]> + @@ -208,4 +211,4 @@ ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl index 89074ea928..f16fcc426d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl @@ -1,4 +1,7 @@ + +]> + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl index 96daef1558..e01e38c2dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl @@ -1,4 +1,7 @@ + +]> + @@ -257,4 +260,4 @@ ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index b0de6095ce..1860684c72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -1,4 +1,7 @@ + +]> + +]> +]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl index ca68bb760b..8998b53fea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl @@ -1,4 +1,5 @@ +]> @@ -76,4 +77,4 @@ - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl index 60975e01e3..289bde77b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl @@ -1,4 +1,7 @@ + +]> + @@ -197,4 +200,4 @@ ---> \ No newline at end of file +--> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl index 7891650103..7b69a0caaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl @@ -1,5 +1,7 @@ - + +]> + + +]> + + +]> ]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl index f41b110acb..8f49e73619 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl @@ -1,4 +1,5 @@ +]> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl index ee4058a56f..fe18b8064d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl @@ -1,4 +1,5 @@ +]> @@ -52,4 +53,4 @@
-
\ No newline at end of file +
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 27d08913a0..9ec913cdca 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -1,4 +1,5 @@ +]> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl index d2b6b1b727..1a4e042f4d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl @@ -1,4 +1,7 @@ + +]> + + +]> + +]> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl index 22b8b7856e..17c9b67cb1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl @@ -1,5 +1,7 @@ - + +]> +