[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-12-g41e49ef

[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.18.x has been updated
       via  41e49ef6f8998083d9659477ff5a8247ab1fab45 (commit)
       via  cd518ca5eb83bf5bed1b221286de943e09bbecb7 (commit)
      from  ba304581103267063ee5bb2e4c660ef9e054a296 (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 41e49ef6f8998083d9659477ff5a8247ab1fab45
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Mar 10 14:25:48 2015 -0400

    Bug 13818 - Editing and saving a course reserve displays the add item form
    
    If one chooses to edit an existing course reserve for an item, saving it
    should go back to the course details, but instead displays the "add
    items: scan barcode" form.
    
    Test Plan:
    1) Edit a course reserve
    2) Save it
    3) Note you get the "add items: scan barcode" form
    4) Apply this patch
    5) Repeat steps 1 and 2
    6) Note you are now redirected back to the course details page
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 413a3002992e68f9c6aa27b2d40b6ba9c5685bd9)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit cd518ca5eb83bf5bed1b221286de943e09bbecb7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Mar 17 23:31:00 2015 +0100

    Bug 13856: Hard to translate strings on patron search results page
    
    'Add selected patrons to:' at the top of the patron search result
    table is hard to translate correctly, because the 'to:' appears
    as a separate string from the rest of the sentence.
    
    To test:
    - Make sure patron lists are activated
    - Do a patron search with more than 1 result
    - Look for the text at the top of the search results table
    - Verify it looks the same before and after the patch
    
    Bonus:
    - run perl translate update <langcode> and verify the
      2 strings are now 1 string with the patch applied
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit cc01bfe8e84b7ce64567ddaf957fcbde7d255ac6)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 course_reserves/add_items.pl                                    |    7 +++++++
 .../prog/en/modules/course_reserves/add_items-step2.tt          |    1 +
 .../prog/en/modules/course_reserves/course-details.tt           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt       |    3 +--
 4 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository