Bugzilla – Attachment 12756 Details for
Bug 8872
Improve encoding for xslt files, showmarc and opac-showmarc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch 2 for intranet xslt
patch.txt (text/plain), 14.91 KB, created by
Marcel de Rooy
on 2012-10-10 13:57:04 UTC
(
hide
)
Description:
Patch 2 for intranet xslt
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2012-10-10 13:57:04 UTC
Size:
14.91 KB
patch
obsolete
>From 5f22757fd36b79d93fe3cffe98600ca92f4ab42a Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 4 Oct 2012 12:00:28 +0200 >Subject: [PATCH] Bug 8872: Add UTF-8 encoding to intranet xslt files >Content-Type: text/plain; charset="utf-8" > >--- > .../intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl | 2 +- > .../intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl | 2 +- > .../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 2 +- > .../prog/en/xslt/MARC21slim2OAIDC.xsl | 2 +- > .../prog/en/xslt/MARC21slim2RDFDC.xsl | 2 +- > .../prog/en/xslt/MARC21slim2RDFDC.xsl.1 | 2 +- > .../intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl | 2 +- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- > .../prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +- > .../prog/en/xslt/MARC21slim9522852.xsl | 2 +- > .../prog/en/xslt/NORMARCslim2OAIDC.xsl | 2 +- > .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 2 +- > .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 2 +- > .../intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl | 2 +- > .../prog/en/xslt/UNIMARCslim2OAIDC.xsl | 2 +- > .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +- > .../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- > .../prog/en/xslt/oilsMARC21slim2HTML.xsl | 2 +- > 18 files changed, 18 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl >index 2d6d5ba..aabefe4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl >@@ -4,7 +4,7 @@ > > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <!--Added ISBN and deleted attributes 6/04 jer--> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl >index 2ba9cf1..a9fa440 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl >@@ -7,7 +7,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <xsl:template match="/"> > <xsl:apply-templates/> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl >index c641b8c..43c7ae5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl >@@ -2,7 +2,7 @@ > <!DOCTYPE stylesheet [<!ENTITY nbsp " " >]> > <xsl:stylesheet version="1.0" xmlns:xlink="http://www.w3.org/TR/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns="http://www.loc.gov/mods/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:include href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <xsl:template match="/"> > <collection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/mods/ http://www.loc.gov/standards/marcxml/schema/mods.xsd"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl >index 289bde7..291ab06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl >@@ -4,7 +4,7 @@ > > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > <!--Added ISBN and deleted attributes 6/04 jer--> > <xsl:template match="/"> > <xsl:if test="marc:collection"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl >index b888431..32b71d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl >@@ -2,7 +2,7 @@ > <!DOCTYPE stylesheet [<!ENTITY nbsp " " >]> > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <xsl:template match="/"> > <xsl:apply-templates/> >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 00201a7..d100a59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 >@@ -4,7 +4,7 @@ > > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <!--Added ISBN and deleted attributes 6/04 jer--> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl >index f16fcc4..9d38ee1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl >@@ -4,7 +4,7 @@ > > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils2.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <!--Added ISBN and deleted attributes 6/04 jer--> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 2e1754b..ea36118 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -9,7 +9,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc items"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+ <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:template match="/"> > <xsl:apply-templates/> > </xsl:template> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >index 3714dab..ca517cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >@@ -7,7 +7,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc items"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+ <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:key name="item-by-status" match="items:item" use="items:status"/> > <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl >index 351e366..1a10e8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl >@@ -7,7 +7,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > > <xsl:template match="/"> > <xsl:apply-templates/> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl >index 289bde7..291ab06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl >@@ -4,7 +4,7 @@ > > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > <!--Added ISBN and deleted attributes 6/04 jer--> > <xsl:template match="/"> > <xsl:if test="marc:collection"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl >index 5ea4fc7..cc89768 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl >@@ -6,7 +6,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc items"> > <xsl:import href="NORMARCslimUtils.xsl"/> >- <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+ <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:template match="/"> > <xsl:apply-templates/> > </xsl:template> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl >index 5ee95ff..0f41700 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl >@@ -7,7 +7,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc items"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+ <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:key name="item-by-status" match="items:item" use="items:status"/> > <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/> > >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 7b69a0c..32e8aec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl >@@ -7,7 +7,7 @@ > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xmlns:marc="http://www.loc.gov/MARC21/slim" > version="1.0"> >- <xsl:output method="html" doctype-public="-//W3C/DTD html 4.01 Transitional//EN" doctype-system="http://www.w3.org/TR/html4/strict.dtd" /> >+ <xsl:output method="html" doctype-public="-//W3C/DTD html 4.01 Transitional//EN" doctype-system="http://www.w3.org/TR/html4/strict.dtd" encoding="UTF-8"/> > <xsl:template match="/"> > <html> > <head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl >index cf6475d..04e5b24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl >@@ -9,7 +9,7 @@ > xmlns:dc="http://purl.org/dc/elements/1.1/" > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc"> > <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method="xml" indent="yes"/> >+ <xsl:output method="xml" indent="yes" encoding="UTF-8"/> > <xsl:template match="/"> > <xsl:if test="marc:collection"> > <oai_dc:dcCollection xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl >index 5c80f08..f297cc7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl >@@ -9,7 +9,7 @@ > exclude-result-prefixes="marc items"> > > <xsl:import href="UNIMARCslimUtils.xsl"/> >-<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:template match="/"> > <xsl:apply-templates/> > </xsl:template> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl >index be83929..963fd72 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl >@@ -6,7 +6,7 @@ > xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > exclude-result-prefixes="marc items"> > <xsl:import href="UNIMARCslimUtils.xsl"/> >-<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" /> >+<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> > <xsl:key name="item-by-status" match="items:item" use="items:status"/> > <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl >index 8f49e73..dcf76e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl >@@ -1,7 +1,7 @@ > <?xml version="1.0" encoding="UTF-8"?> > <!DOCTYPE stylesheet [<!ENTITY nbsp " " >]> > <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> >- <xsl:output method="html"/> >+ <xsl:output method="html" encoding="UTF-8"/> > > <xsl:template match="/"> > <html> >-- >1.7.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8872
:
12755
|
12756
|
12757
|
12758
|
12759
|
12986
|
12987
|
12988
|
12989
|
12990
|
13171
|
13172
|
13173
|
13244
|
13245
|
13248