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

[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  3fa60aaf969962f5d184c2fdff2dc4c37bfbe5c5 (commit)
       via  e90f5494f36f8af9dad5659d0220656767a9bbb3 (commit)
      from  6a3477b2cc5d67adc51dae81a0c953f4923b1d99 (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 3fa60aaf969962f5d184c2fdff2dc4c37bfbe5c5
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 09:37:02 2017 +0200

    Bug 18681 - (followup) Remove on more [%% in translation for about.tt
    
    Test plan same as in previous patch
    Run QA tools in newest version (test for line breaks in tt directives)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 880c2e19c3c5f10f110fd80a44f0d111b9d05472)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e90f5494f36f8af9dad5659d0220656767a9bbb3
Author: Marc Véron <veron at veron.ch>
Date:   Fri May 26 19:11:59 2017 +0200

    Bug 18681: Translatability: Get rid of [%% in translation for about.tt
    
    Translation tool picks a line
    %s [%% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords ||
    ...due to a line break inside a template directive.
    This patch fixes it.
    
    To test:
    - Update QA tools
      (see https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18675#c2)
    - Verify that code change makes sense
    - Apply patch
    - Run QA tools
    
    Followed test plan and everything was as intended
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    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 1c8c84f4be8665d95ededf5174c406e1a63d6529)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository