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

[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  6a3477b2cc5d67adc51dae81a0c953f4923b1d99 (commit)
      from  b6f5f0331d6ea8b472a1e06b54d787482f4ae88d (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 6a3477b2cc5d67adc51dae81a0c953f4923b1d99
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 10:47:48 2017 +0200

    Bug 18695: Translatability: Get rid of [%% INCLUDE in translation for circulation.tt
    
    The file circ/circulation.tt exposes the following line to translation:
    %s %s [%% INCLUDE 'blocked-fines.inc' fines = chargesamount %%] %s %s
    Translators should not be confronted with code internals.
    
    This patch fixes it by removing a line break.
    
    To test:
    - Verify that code change makes sense
    - Run QA tools in newest version (check for line breaks in tt directives)
    - Bonus test: Create a "language" aa-AA (perl translate create aa-AA
      from folder misc/translator, verify that line mentioned above do
      no longer appear in aa-AA-staff-prog.po )
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c5726913774ed25c4125e65a12054a00c2f7dd76)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository