Attachment 52232 Details for Bug 16608 – Bug 16608 - Missing entity nbsp in some XML files

[patch] Bug 16608 - Missing entity nbsp in some XML files

Bug-16608---Missing-entity-nbsp-in-some-XML-files.patch (text/plain), 6.28 KB, created by Jonathan Druart on 2016-06-10 14:38:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-06-10 14:38:34 UTC

Size: 6.28 KB

patch

obsolete

>From 8734fe192c39447eba039aafcdaf156485eb1ca8 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Fri, 27 May 2016 10:50:00 +0200
>Subject: [PATCH] Bug 16608 - Missing entity nbsp in some XML files
>
>The special character "non breaking space" &nbsp; is not contained in XML syntax by default.
>So we add it in the file header :
><!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>
>Even if the source code files do no contain this character, it can be that translated files contain it.
>French for example "Titre&nbsp;:".
>
>This entity is missing in all files in koha-tmpl/intranet-tmpl/prog/en/data/ and in some files of koha-tmpl/intranet-tmpl/prog/en/xslt.
>
>Test plan :
>  - 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
>  - translate again
>  - run test again: it passes
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Works as described following test plan
>Tes pass, no errors.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml            | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml            | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd             | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl             | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl  | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl            | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl | 3 +++
> 7 files changed, 21 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
>index cfd16e8..ae0a641 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
>+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
>@@ -1,4 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <Tagfield tag="006" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
>   <Material id="BKS"><name>Books</name><description></description>
>     <Position pos="00"><name>Form of material</name><description></description>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
>index 32055a7..eb62dd5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
>+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
>@@ -1,4 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <Tagfield tag="008" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
>   <Material id="BKS"><name>Books</name><description></description>
>     <Position pos="00-05"><name>Date entered on file</name><description>Computer-generated, six-character numeric string that indicates the date the MARC record was created. Recorded in the pattern yymmdd.</description></Position>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
>index 3398ba8..be91f27 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
>+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
>@@ -1,4 +1,7 @@
> <?xml version="1.0"?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <xs:schema xmlns="http://koha-community.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://koha-community.org" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
>   <xs:annotation>
>     <xs:documentation>Control field plugin type of materials schema</xs:documentation>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
>index 15aa17a..8af36c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
>@@ -1,4 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <xsl:stylesheet version="1.0" xmlns:mads="http://www.loc.gov/mads/v2"
>     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim"
>     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
>index d692ef6..bf4af4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
>@@ -1,5 +1,8 @@
> <?xml version="1.0" encoding="UTF-8"?>
> 
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <xsl:stylesheet version="1.0"
>   xmlns:marc="http://www.loc.gov/MARC21/slim"
>   xmlns:items="http://www.koha-community.org/items"
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
>index 293f4cf..7d1400a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
>@@ -1,4 +1,7 @@
> <?xml version='1.0'?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
> 	<xsl:template name="datafield">
> 		<xsl:param name="tag"/>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>index fcc4510..3e30890 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>@@ -1,4 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
>+
>+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
>+
> 
> <xsl:stylesheet version="1.0"
>   xmlns:marc="http://www.loc.gov/MARC21/slim"
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 16608: 51862 | 51863 | 51864 | 51886 | 51887 | 52231 | 52232