[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.04-2-g4dada1a

[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  4dada1ac6ac0e4224d55ec69485e29d6cfc7fc2d (commit)
       via  a774b321672c17564e91d66a51080021fd1c2b6a (commit)
      from  24f4bdab3175e2abbb77cf472795de8d1473a2ae (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 4dada1ac6ac0e4224d55ec69485e29d6cfc7fc2d
Author: Marc Véron <veron at veron.ch>
Date:   Tue Feb 10 18:16:45 2015 +0100

    Bug 13682 - Capitalization: Holds Queue
    
    This patch changes capitalization of Holds Queue to Holds queue in koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueu$
    
    To test:
    Apply patch
    Go to Circulation > Holds queue page
    Verify that the capitalization is correct
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Works as advertised.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 8804598f3dcff3ccacc34723939cf072d8451fac)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit a774b321672c17564e91d66a51080021fd1c2b6a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Feb 13 13:30:56 2015 +0100

    Bug 13700: Fix item search templates for translation
    
    Since translator rebuild HTML tags with double quotes for attributes
    values, use double quotes in english template too and escape them with
    backslash.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    It works well!!
    
    Test:
    1) Intall translation  (de-DE, es-ES)
    2) to Go to item search, in english, do a search that gives results
    3) Switch language, repeat search, result's table does not render
    4) Apply patch
    5) Install translation again
    6) Repeat 3, now results are displayed
    
    No koha-qa errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 39c22b1a6a744d6b4c50c3a4b62295ab3a601636)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/includes/catalogue/itemsearch_item.json.inc    |   12 +++++++++---
 .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt  |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository