Attachment 104498 Details for Bug 25082 – Bug 25082: Don't remove characters from string

[patch] Bug 25082: Don't remove characters from string

Bug-25082-Dont-remove-characters-from-string.patch (text/plain), 2.33 KB, created by Jonathan Druart on 2020-05-07 11:55:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-05-07 11:55:12 UTC

Size: 2.33 KB

patch

obsolete

>From 0d1653b4836a0509d080de6946f31b6a1fbbc761 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Tue, 5 May 2020 11:43:39 +0000
>Subject: [PATCH] Bug 25082: Don't remove characters from string
>
>At the moment, show-lang-041 will either get a code
>or an AV description to deal with. If it's a description,
>we don't want to remove spaces and other chars from it.
>
>To test:
>- Repeat tests from first patch with an AV in LANG category
> that consists of multiple words, has a - and other possible
> punctuation.
>- The description should show correctly in OPAC and staff.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>index acb122b1c1..7fb14ad515 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>@@ -385,7 +385,7 @@
> 	 
> 	 <xsl:attribute name="class">lang_code-<xsl:value-of select="translate(., ' .-;|#', '_')"/></xsl:attribute>
> 	 <xsl:call-template name="languageCodeText">
>-		<xsl:with-param name="code" select="translate(., ' .-;|#', '')"/>
>+		<xsl:with-param name="code" select="."/>
> 	 </xsl:call-template>
> 	 <xsl:if test="position() != last()">
> 	 <xsl:text>, </xsl:text>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
>index 4b83326bfa..bc8b4f75f9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
>@@ -349,7 +349,7 @@
> 
> <xsl:attribute name="class">lang_code-<xsl:value-of select="translate(., ' .-;|#', '_')"/></xsl:attribute>
> <xsl:call-template name="languageCodeText">
>- <xsl:with-param name="code" select="translate(., ' .-;|#', '')"/>
>+ <xsl:with-param name="code" select="."/>
> </xsl:call-template>
> <xsl:if test="position() != last()">
> <xsl:text>, </xsl:text>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25082: 102959 | 102988 | 104355 | 104379 | 104497 | 104498