Attachment 95934 Details for Bug 23732 – Bug 23732: Renamed TODOs and added translation capabilities

[patch] Bug 23732: Renamed TODOs and added translation capabilities

Bug-23732-Renamed-TODOs-and-added-translation-capa.patch (text/plain), 7.99 KB, created by Arthur Suzuki on 2019-12-03 01:10:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Arthur Suzuki

Created: 2019-12-03 01:10:36 UTC

Size: 7.99 KB

patch

obsolete

>From 7a2904e9e18c74fd3bb90b3596b40c7ebb72c0b6 Mon Sep 17 00:00:00 2001
>From: Arthur Suzuki <arthur.suzuki@biblibre.com>
>Date: Tue, 3 Dec 2019 02:01:45 +0100
>Subject: [PATCH] Bug 23732: Renamed TODOs and added translation capabilities
>
>---
> .../prog/en/modules/reserve/request.tt        | 45 ++++++++++---------
> 1 file changed, 23 insertions(+), 22 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 8eed08842f..7ce3135b12 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -8,6 +8,7 @@
> [% USE AuthorisedValues %]
> [% USE Price %]
> [% SET footerjs = 1 %]
>+[% PROCESS 'i18n.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% UNLESS ( multi_hold ) %]
>     <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on [% INCLUDE 'biblio-title-head.inc' %]</title>
>@@ -39,31 +40,31 @@
> <div class="main container-fluid">
>     <div class="row">
> 
>-        <div class="modal fade" id="TODOmyModal" tabindex="-1" role="dialog" aria-labelledby="TODOmyModalLabel">
>+        <div class="modal fade" id="holdruleschecker" tabindex="-1" role="dialog" aria-labelledby="holdruleschecker">
>             <div class="modal-dialog" role="document">
>                 <div class="modal-content">
>                     <div class="modal-header">
>-                        <h4 class="modal-title" id="myModalLabel">Holding rules</h4>
>+                        <h4 class="modal-title" id="holdrulestitle">[% t('Holding rules') %]</h4>
>                     </div>
>                     <div class="modal-body">
>                         <div>
>-                            <h4>Overall info</h4>
>+                            <h4>[% t('Overall info') %]</h4>
>                                 <ul>
>                                     <li>
>-                                        Patron has <strong>[% reserves_count | html %]</strong> hold(s) and this request would raise the number to <strong>[% new_reserves_count + reserves_count | html %]</strong>.
>+                                        [% tx('Patron has <strong>{reserves_count}</strong> hold(s) and this request would raise the number to <strong>{new_reserves_count}</strong>.', { reserves_count = reserves_count , new_reserves_count = new_reserves_count + reserves_count } ) %]
>                                     </li>
>                                     <li>
>                                         <span [% IF reserves_count >= Koha.Preference('maxreserves') %] class="text-danger" [% END %]>
>-                                            <i>maxreserves</i> preference: <strong>[% Koha.Preference('maxreserves') | html %]</strong>
>+                                            <i>[% t('maxreserves') %]</i> [% t('preference') %]: <strong>[% Koha.Preference('maxreserves') | html %]</strong>
>                                         </span>
>                                     </li>
>                                     <li>
>-                                        <i>ReservesControlBranch</i> preference: <strong>[% Koha.Preference('ReservesControlBranch') | html %]</strong> 
>+                                        <i>[% t('ReservesControlBranch') %]</i> [% t('preference') %]: <strong>[% Koha.Preference('ReservesControlBranch') | html %]</strong>
>                                     </li
>                                 </ul>
>                         </div>
> 
>-                        <h4>Per record info</h4>
>+                        <h4>[% t('Per record info') %]</h4>
>                         <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
> 
>                             [% FOREACH element IN whyicantreserve %]
>@@ -79,15 +80,15 @@
>                                         <div class="panel-body">
> 
>                                             <div id="elements-to-reserve-details">
>-                                                <h5>Matched circulation rule:</h5>
>+                                                <h5>[% t('Matched circulation rule:') %]</h5>
>                                                 <table>
>                                                     <tr>
>-                                                        <th>Library</th>
>-                                                        <th>Category</th>
>-                                                        <th>Item type</th>
>-                                                        <th>Holds</th>
>-                                                        <th>Holds per record</th>
>-                                                        <th>Holds per day</th>
>+                                                        <th>[% t('Library') %]</th>
>+                                                        <th>[% t('Category') %]</th>
>+                                                        <th>[% t('Item type') %]</th>
>+                                                        <th>[% t('Holds') %]</th>
>+                                                        <th>[% t('Holds per record') %]</th>
>+                                                        <th>[% t('Holds per day') %]</th>
>                                                     </tr>
>                                                     <tr>
>                                                         <td>
>@@ -124,13 +125,13 @@
>                                                     </tr>
>                                                 </table>
> 
>-                                                <h5>Matched hold policy:</h5>
>+                                                <h5>[% t('Matched hold policy:') %]</h5>
> 
>                                                 <table>
>                                                     <tr>
>-                                                        <th>Library</th>
>-                                                        <th>Category</th>
>-                                                        <th>Holds</th>
>+                                                        <th>[% t('Library') %]</th>
>+                                                        <th>[% t('Category') %]</th>
>+                                                        <th>[% t('Holds') %]</th>
>                                                     </tr>
>                                                     <tr>
>                                                         [% IF element.circulation_rule %]
>@@ -149,7 +150,7 @@
>                                                                 [% element.circulation_rule.rule_value || 'unlimited' | html %]
>                                                             </td>
>                                                         [% ELSE %]
>-                                                            <td colspan="3">No rule matched</td>
>+                                                            <td colspan="3">[% t('No rule matched') %]</td>
>                                                         [% END %]
>                                                     </tr>
>                                                 </table>
>@@ -162,7 +163,7 @@
>                         </div>
>                     </div>
>                     <div class="modal-footer">
>-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
>+                        <button type="button" class="btn btn-default" data-dismiss="modal">[% t('Close') %]</button>
>                     </div>
>                 </div>
>             </div>
>@@ -205,8 +206,8 @@
>                 [% END %]
> 
>                 [% IF whyicantreserve %]
>-                    <button type="button" class="btn btn-info btn-sm" data-toggle="modal" data-target="#TODOmyModal">
>-                        Show holding rules
>+                    <button type="button" class="btn btn-info btn-sm" data-toggle="modal" data-target="#holdruleschecker">
>+                        [% t('Show holding rules') %]
>                     </button>
>                 [% END %]
>             </h1>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23732: 95435 | 95436 | 95443 | 95444 | 95445 | 95934 | 147501 | 147504 | 173427 | 173428