gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30992: Improve translatability for Waiting at|On hold 

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2022-07-13 08:01:34 +02:00 committed by Tomas Cohen Arazi
parent e544ff4345
commit eedec9e929
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View File

@ -801,19 +801,25 @@
[% IF ( itemloo.nocancel ) %]
<span>Can't be cancelled when item is in transit</span>
[% ELSE %]
[% IF ( itemloo.waitingdate ) %]<span>Waiting</span>[% ELSE %]<span>On hold</span>[% END %]
[% IF ( itemloo.canreservefromotherbranches ) %]
<span>for</span> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>
[% END %]
[% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %]
[% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] <span>since</span>
[% IF ( itemloo.waitingdate ) %]
[% itemloo.waitingdate | $KohaDates %]
[% ELSE %]
[% IF ( itemloo.reservedate ) %]
[% itemloo.reservedate | html %]
[% IF ( itemloo.canreservefromotherbranches ) %]
<span>Waiting for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
[% ELSE %]
<span>Waiting at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
[% END %]
[% END %].
[% ELSE %]
[% IF ( itemloo.canreservefromotherbranches ) %]
[% IF itemloo.reservedate %]
<span>On hold for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since</span>
[% ELSE %]
<span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
[% END %]
[% ELSIF itemloo.reservedate %]
<span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.reservedate | $KohaDates %]</span>
[% ELSE %]
<span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
[% END %]
[% END %]
<a class="info cancel-hold" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&amp;CancelItemnumber=[% itemloo.itemnumber | html %]">Cancel hold</a>
[% END # /IF itemloo.nocancel %]
[% ELSE %]

20
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View File

@ -438,24 +438,12 @@
[% IF ( itemLoo.reservedate ) %]
<span class="waiting">
[% IF ( itemLoo.waitingdate ) %]
<span>Waiting</span>
<span>Waiting for patron at [% itemLoo.ExpectedAtLibrary | html %] since [% itemLoo.waitingdate | $KohaDates %]</span>
[% ELSIF ( itemLoo.reservedate ) %]
<span>On hold for patron expected at [% itemLoo.ExpectedAtLibrary | html %] since [% itemLoo.reservedate | $KohaDates %]</span>
[% ELSE %]
<span>On hold</span>
<span>On hold for patron expected at [% itemLoo.ExpectedAtLibrary | html %]</span>
[% END %]
<span>for patron</span>
[% IF ( itemLoo.waitingdate ) %]
<span>at</span>
[% ELSE %]
<span>expected at</span>
[% END %]
[% itemLoo.ExpectedAtLibrary | html %] <span>since</span>
[% IF ( itemLoo.waitingdate ) %]
[% itemLoo.waitingdate | $KohaDates %]
[% ELSE %]
[% IF ( itemLoo.reservedate ) %]
[% itemLoo.reservedate | html %]
[% END %]
[% END %].
</span>
[% ELSE %]
<span class="notonhold">Not on hold</span>

2
opac/opac-reserve.pl
View File

@ -515,7 +515,7 @@ foreach my $biblioNum (@biblionumbers) {
if ( my $first_hold = $holds->next ) {
$itemLoopIter->{backgroundcolor} = 'reserved';
$itemLoopIter->{reservedate} = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
$itemLoopIter->{reservedate} = $first_hold->reservedate,
$itemLoopIter->{ExpectedAtLibrary} = $first_hold->branchcode;
$itemLoopIter->{waitingdate} = $first_hold->waitingdate;
}

2
reserve/request.pl
View File

@ -431,7 +431,7 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
my $p = Koha::Patrons->find( $first_hold->borrowernumber );
$item->{backgroundcolor} = 'reserved';
$item->{reservedate} = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
$item->{reservedate} = $first_hold->reservedate;
$item->{ReservedFor} = $p;
$item->{ExpectedAtLibrary} = $first_hold->branchcode;
$item->{waitingdate} = $first_hold->waitingdate;