[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.03-49-gea316ad

[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, 17.05.x has been updated
       via  ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b (commit)
       via  dcafcbc036f9229d2d2854012f80fe051012a349 (commit)
      from  4c76583e6d3079bad51048f62f43c3c433f1e9bd (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 ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Sep 12 14:57:25 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    Followup correcting a typo of previous patch :
      name="holdingbranch" options = branche
    it is branche[s]
    
    Test plan :
    - Look at 'Current location' in item search
    => Without patch you see only 'All libraries'
    => With patch you see 'All libraries' and each existing library, like in 'Home library'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 889fabe9f28f3b6ef35fc36e73b12652f258510c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit dcafcbc036f9229d2d2854012f80fe051012a349
Author: Marc Véron <veron at veron.ch>
Date:   Thu Jun 29 15:22:54 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    This patch removes entries like the following in translations of itemsearch.tt:
    "[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
    "empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
    "\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
    "[%% INCLUDE form_field_select name=\"location\" options = locations "
    "empty_option = \"All locations\" %%] %s "
    
    New patch on top of Bug 18633 that resolves parts of initial comment.
    
    To test:
    - Verify that in itemsearch.tt no tt directives are splitted by new lines
      (search for [% INCLUDE )
    - Verify that itemsearch.tt works as before
    
    Followed test plan and verified that tt directives are not split by new
    lines, the changes to the fieldset tags in comment 3 have been removed
    and itemtype.tt still works correctly as before
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 25fa02272d16c98d49a6020e867f60bc0510d960)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/catalogue/itemsearch.tt        |   36 ++++----------------
 1 file changed, 6 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository