From dceb3ed02284270af12b711014d30555115403f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Tue, 15 Dec 2015 11:21:08 +0100 Subject: [PATCH] Bug 15375 - Translatability: Fix issues on OPAC page 'Placing a hold' Fix several issues with odd translations on opac-reserve.tt due to string splitting by tags. In addition, streamline messages to make them similar to the same messages on the OPAC summary page (Bug 15374) To test: - Apply patch - Log in to OPAC - with blocked /debarred user (with and without comment and date) - with user who has to much fines - with user who has his card marked as lost - with user with expired account - with user with uncertain address information - Try to put holds - Verify that message about why holds are not possible is correct and displays nicely and that links in messages work - Carefully examine code - Search for regressions (Amended: stray i removed, test plan updated, removed account that is about to expire) Signed-off-by: Aleisha I am going to sign off on this because it works as it should and I think the problems I had in comment 8 are a separate bug. Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher (cherry picked from commit f0face38698b5c803604b37509edad98e2291bcd) Signed-off-by: Julian Maurice --- .../bootstrap/en/modules/opac-reserve.tt | 78 +++++++++++-------- 1 file changed, 46 insertions(+), 32 deletions(-) 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 ca35f76300..ba60545d3c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -1,5 +1,6 @@ [% USE Koha %] [% USE KohaDates %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold [% INCLUDE 'doc-head-close.inc' %] @@ -16,79 +17,92 @@
- -
- [% IF ( message ) %] +
+ [% IF ( message ) %] +
+

Sorry, you cannot place holds.

+
    [% IF ( GNA ) %] -
    -

    Sorry, you cannot place holds because the library doesn't have up-to-date contact information on file.

    -

    Please contact your librarian, or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online)

    -
    +
  • + According to our records, we don't have up-to-date contact information. Please contact the library. + [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] + [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %] +
    • [% END %] [% IF ( lost ) %] -
    -

    Sorry, you cannot place holds because your library card has been marked as lost or stolen.

    -

    If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.

    -
    +
  • + Your library card has been marked as lost or stolen.
    + If this is an error, please take your card to the circulation desk at your local library and the error will be corrected. +
    • [% END %] [% IF ( debarred ) %] -
    -

    Sorry, you cannot place holds because your account has been frozen.

    -

    Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please consult a librarian.

    -
    +
  • + Your account has been frozen. + [% IF ( BORROWER_INF.debarredcomment ) %] Comment: "[% BORROWER_INF.debarredcomment %]"[% END %] + [% IF ( BORROWER_INF.userdebarreddate ) %] End date: [% BORROWER_INF.userdebarreddate | $KohaDates %][% END %] +
    Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library. Go to your account page +
    • [% END %] [% IF ( too_much_oweing ) %] -
    - Sorry, you cannot place holds because you owe [% too_much_oweing %]. -
    +
  • + You have unpaid fines. Amount: [% too_much_oweing | $Price %]. +
    • [% END %] [% IF ( too_many_reserves ) %] -
    +
  • Sorry, you cannot place more than [% too_many_reserves %] holds. -
    • + [% END %] [% IF ( bad_biblionumber ) %] -
    - ERROR: No biblio record found for biblionumber [% bad_biblionumber %].
    +
  • + ERROR: No biblio record found for biblionumber [% bad_biblionumber %]. +
    • [% END %] [% IF ( no_items_selected ) %] -
    +
  • You must select at least one item. -
    • + [% END %] [% IF ( no_branch_selected ) %] -
    +
  • You must select a library for pickup. -
    • + [% END %] [% IF ( no_biblionumber ) %] -
    ERROR: No biblionumber received.
    +
  • + ERROR: No biblionumber received. +
    • [% END %] [% IF ( bad_data ) %] -
    ERROR: Internal error: incomplete hold request.
    +
  • + ERROR: Internal error: incomplete hold request. +
    • [% END %] [% IF ( expired_patron ) %] -
    Sorry, you cannot place holds because your library card has expired.

    Please contact your librarian if you wish to renew your card.

    +
  • + Your library card has expired. Please contact your librarian if you wish to renew your card. +
    • [% END %] [% ELSE %] [% IF ( none_available ) %] -
    Sorry, none of these items can be placed on hold. +
    + Sorry, none of these items can be placed on hold.
    [% END %] - - [% END # / IF message %] +
    + [% END # / IF message %] [% UNLESS ( message ) %] [% UNLESS ( none_available ) %] -- 2.39.5