Attachment 80116 Details for Bug 20941 – Bug 20941: (follow-up) Wrap N/A strings in <span>

[patch] Bug 20941: (follow-up) Wrap N/A strings in <span>

Bug-20941-follow-up-Wrap-NA-strings-in-span.patch (text/plain), 5.90 KB, created by Andrew Isherwood on 2018-10-05 14:27:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-10-05 14:27:19 UTC

Size: 5.90 KB

patch

obsolete

>From f2480f8194800b375096ccda1987647253a51ee3 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Thu, 4 Oct 2018 13:38:20 +0100
>Subject: [PATCH] Bug 20941: (follow-up) Wrap N/A strings in <span>
>
>All N/A strings in ILL templates wrapped in <span> to aid translation
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt  | 12 ++++++------
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 10 +++++-----
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index 2e199a486f..918d41556c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -438,11 +438,11 @@
>                                 </li>
>                                 <li class="medium">
>                                     <label class="medium">Request type:</label>
>-                                    [% type || 'N/A' | html %]
>+                                    [% type || '<span>N/A</span>' | html %]
>                                 </li>
>                                 <li class="cost">
>                                     <label class="cost">Cost:</label>
>-                                    [% request.cost || 'N/A' | html %]
>+                                    [% request.cost || '<span>N/A</span>' | html %]
>                                 </li>
>                                 <li class="req_id">
>                                     <label class="req_id">Request number:</label>
>@@ -510,7 +510,7 @@
>                             <div class="rows">
>                                 <div class="orderid">
>                                     <span class="label orderid">Order ID:</span>
>-                                    [% request.orderid || "N/A" | html %]
>+                                    [% request.orderid || '<span>N/A</span>' | html %]
>                                 </div>
>                                 <div class="borrowernumber">
>                                     <span class="label borrowernumber">Patron:</span>
>@@ -522,7 +522,7 @@
> 
>                                 <div class="biblio_id">
>                                     <span class="label biblio_id">Bibliographic record ID:</span>
>-                                    [% request.biblio_id || "N/A" | html %]
>+                                    [% request.biblio_id || '<span>N/A</span>' | html %]
>                                 </div>
>                                 <div class="branchcode">
>                                     <span class="label branchcode">Library:</span>
>@@ -539,11 +539,11 @@
>                                 <div class="medium">
>                                     <span class="label medium">Request type:</span>
>                                     % type = request.get_type %]
>-                                    [% type || 'N/A' | html %]
>+                                    [% type || '<span>N/A</span>' | html %]
>                                 </div>
>                                 <div class="cost">
>                                     <span class="label cost">Cost:</span>
>-                                    [% request.cost || "N/A" | html %]
>+                                    [% request.cost || '<span>N/A</span>' | html %]
>                                 </div>
>                                 <div class="req_id">
>                                     <span class="label req_id">Request number:</span>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>index c5ff708c10..e3ff91f353 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
>@@ -126,10 +126,10 @@
>                                 [% status = request.status | html %]
>                                 [% type = request.get_type %]
>                                 <tr>
>-                                    <td>[% request.metadata.Author || 'N/A' | html %]</td>
>-                                    <td>[% request.metadata.Title || 'N/A' | html %]</td>
>+                                    <td>[% request.metadata.Author || '<span>N/A</span>' | html %]</td>
>+                                    <td>[% request.metadata.Title || '<span>N/A</span>' | html %]</td>
>                                     <td>[% request.backend | html %]</td>
>-                                    <td>[% type || 'N/A' | html %]</td>
>+                                    <td>[% type || '<span>N/A</span>' | html %]</td>
>                                     <td>[% request.capabilities.$status.name | html %]</td>
>                                     <td>[% request.placed | html %]</td>
>                                     <td>[% request.updated | html %]</td>
>@@ -169,7 +169,7 @@
>                                     </li>
>                                     <li>
>                                         <label for="medium">Request type:</label>
>-                                        [% type || 'N/A' | html %]
>+                                        [% type || '<span>N/A</span>' | html %]
>                                     </li>
>                                     <li>
>                                         <label for="placed">Request placed:</label>
>@@ -194,7 +194,7 @@
>                                 [% FOREACH meta IN request.metadata %]
>                                     <div class="requestattr-[% meta.key | html %]">
>                                         <span class="label">[% meta.key | html %]:</span>
>-                                        [% meta.value || 'N/A' | html %]
>+                                        [% meta.value || '<span>N/A</span>' | html %]
>                                     </div>
>                                 [% END %]
>                             </div>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20941: 76052 | 79577 | 79825 | 79865 | 79918 | 79919 | 79920 | 79921 | 79945 | 79999 | 80112 | 80113 | 80114 | 80115 | 80116 | 80117 | 80127 | 80128 | 80129 | 80130 | 80131 | 80132 | 80212 | 81688 | 81689 | 81690 | 81691 | 81692 | 81693 | 81694