[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-114-g24ff799

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.22.x has been updated
       via  24ff7998dde7c26ff7cfdea538754d97373833a0 (commit)
       via  0d25dd97ecc1039e351b1740bbe3e78d4756114e (commit)
      from  3802d198c02975cb1c76ddbe2feb0b0ea6f88c49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 24ff7998dde7c26ff7cfdea538754d97373833a0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 9 17:59:52 2016 +0100

    Bug 16478: Fix checkout history tabs - intranet
    
    Test plan:
    Same as before for the intranet.
    And please retest the OPAC => I have changed the filter's values to
    match OPAC/intranet
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3c80b7c19e07ae2c19a45949d91b78ac339a30e9)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 0d25dd97ecc1039e351b1740bbe3e78d4756114e
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 9 18:30:27 2016 +0200

    Bug 16478: Translation breaks display of Checkout history in tab Checks / On-site-checkouts
    
    To test:
    - Make sure that syspref OnsiteCheckouts is enabled
    - Log in to OPAC as a patron who has checkouts, online checkouts and checkout history enabled
    - Go to 'your reading history' (in English)
    - Display all three tabs
    - Apply patch
    - Reload page, display oll three tabs again, there should be no difference
    - Examine source code changes to verify that the words 'checkout' and 'onsite' no longer
      will be exposed to translation.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 64c28e5c725ca3d7473abee71990a19fbd3a2a0d)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/members/readingrec.tt     |    7 +++----
 .../opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt    |   11 +++++------
 2 files changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository