Bugzilla – Attachment 138393 Details for
Bug 30992
Hard to translate single word strings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30992: Improve translatability for Waiting at|On hold
Bug-30992-Improve-translatability-for-Waiting-atOn.patch (text/plain), 9.90 KB, created by
Katrin Fischer
on 2022-07-30 20:47:48 UTC
(
hide
)
Description:
Bug 30992: Improve translatability for Waiting at|On hold
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-07-30 20:47:48 UTC
Size:
9.90 KB
patch
obsolete
>From ed5afa6d4f924f29b49984d637a5c5811f26093c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 13 Jul 2022 08:01:34 +0200 >Subject: [PATCH] Bug 30992: Improve translatability for Waiting at|On hold > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/reserve/request.tt | 26 ++++++++++++------- > .../bootstrap/en/modules/opac-reserve.tt | 20 +++----------- > opac/opac-reserve.pl | 2 +- > reserve/request.pl | 2 +- > 4 files changed, 22 insertions(+), 28 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 3a8b790906..4003c1cb0b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -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 %] >+ [% 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 %] > [% ELSE %] >- [% IF ( itemloo.reservedate ) %] >- [% itemloo.reservedate | html %] >+ [% 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 %]. >+ [% END %] > <a class="info cancel-hold" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&CancelItemnumber=[% itemloo.itemnumber | html %]">Cancel hold</a> > [% END # /IF itemloo.nocancel %] > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index e16095740e..a6fe88e113 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -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> >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index cd71a6af29..f60528f0db 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -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; > } >diff --git a/reserve/request.pl b/reserve/request.pl >index b6bdb0baff..12c675240f 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -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; >-- >2.30.2
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 30992
:
137664
|
137665
|
137666
|
137667
|
137855
|
138393
|
138394
|
138661
|
138662
|
138764