[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-19-g7a181f3

[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  7a181f3e912663ff642ba8dc569416ad4598ca26 (commit)
       via  fae5977438c23ed2fd4a0f4eeb395729a77cae97 (commit)
       via  e7cf94446e1c6ff413bb8d725f9c6cbf2e9adca9 (commit)
      from  2861d291c3478a5c2f2ba89fa30280484f743a82 (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 7a181f3e912663ff642ba8dc569416ad4598ca26
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 9 13:24:07 2017 -0300

    Bug 18648: Restore hyphen
    
    (cherry picked from commit 6999dbafbd2d6708d4c3a8fae7e83855902ebdbb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fae5977438c23ed2fd4a0f4eeb395729a77cae97
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jun 6 11:06:29 2017 -0300

    Bug 18648: Fix syntax 'unexpected end of input'
    
    (cherry picked from commit 023b0890a25d1420a0f4ecb28d54c08a06e6479e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e7cf94446e1c6ff413bb8d725f9c6cbf2e9adca9
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 21:10:32 2017 +0200

    Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt
    
    koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains
    template directives inside a div tag:
    <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]">
    This is exposed in translation tool.
    
    To test:
    - Carefully examine code changes
    - Apply patch, verify that the directive is no longer exposed (picked for
      po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po
    - If you know where / how this macles is used, verify that it behaves as before
    
    (Note: New patch, needs new sign off)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/cataloguing/value_builder/macles.tt             |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository