[koha-commits] main Koha release repository branch master updated. v17.05.00-141-g053fbaf

[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, master has been updated
       via  053fbaf9267cce79ba80d23389b26f46a91111f8 (commit)
       via  58f5a73f41b73361821b847e55a663cc0801c998 (commit)
       via  05b308403152d2287bc0b5d191a60ea88db4ac11 (commit)
       via  9c7761fe89d05fc7114f426ecffdf9635ba1fe97 (commit)
      from  939eadc5d987429db04887623c3f260ee02b86d2 (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 053fbaf9267cce79ba80d23389b26f46a91111f8
Author: Marc Véron <veron at veron.ch>
Date:   Wed Jun 14 11:10:56 2017 +0200

    Bug 18800: Patron card images: Add some more explanation to upload page and fix small translatabiity issue
    
    The file
    koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
    has a small translatability issue (sentence splitting by html tags).
    
    This patch fixes it and adds a little bit more explanation about
    uploading, using and replacing such images.
    
    To test:
    - Verify that text changes make sense
    - Apply patch
    - Go to Home > Tools > Patron card creator > Images and verify
      that the page displays properly
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 58f5a73f41b73361821b847e55a663cc0801c998
Author: Marc Véron <veron at veron.ch>
Date:   Fri May 26 21:08:27 2017 +0200

    Bug 18684 - Get rid of %%] in translation for currency.tt
    
    File add koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt exposes
    parts of template directives due to html tags inide directives. Fix it using
    the HtmlTags filter.
    
    To verify:
    - Create a translation for a language 'aa-AA
    - po file aa-AA-staff-prog.po / translate.koha-community.org for 17.05 contains a line
      '%%]'%sCurrencies %s
    To test:
    - Apply patch on top of Bug 18665
    - Recreate translation
    - Verify that line above is gone
    - Verify that in staff client currencies administration wors as before
    
    Followed test plan and it worked as intended
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
    
    Bug 18684: (followup) Move 2 closing h3 tags to end of previous lines
    
    See comment #4
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 05b308403152d2287bc0b5d191a60ea88db4ac11
Author: Marc Véron <veron at veron.ch>
Date:   Thu May 25 21:52:09 2017 +0200

    Bug 18665: Add test for HtmlTags.pm
    
    This patch adds tests for the tt filter HtmlTags.pm
    
    To test: prove -v t/HtmlTags.t should pass
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9c7761fe89d05fc7114f426ecffdf9635ba1fe97
Author: Marc Véron <veron at veron.ch>
Date:   Wed May 24 16:06:31 2017 +0200

    Bug 18665 - Translatability: Add tt filter to allow html tags inside tt directives
    
    HTML tags inside template toolkit directives are not allowed because of translation issues.
    Add a filter that handles HTML tags.
    
    Note you need to write quotes ' around the text you want displayed as a
    heading
    
    To test:
    - Apply patch
    - Add [% USE HtmlTags %] to the top of a tt file
    - Add something like [% 'My nice title' | $HtmlTags tag="h1" %] to the tt file
    - Verify that in output 'My nice title' has h1 tags
    - Change template directive to something like
      [% 'My nice title' | $HtmlTags tag="h1" attributes='title="This is a nice title attribute"' %]
    - Verify that title attribute displays in output (source code or tooltip on 'My nice title')
    
    Notes: - Tests are planned for a second patch
           - Update for Wiki coding guidelines
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 Koha/Template/Plugin/{KohaDates.pm => HtmlTags.pm} |   20 ++++++++--------
 .../prog/en/modules/admin/currency.tt              |    7 +++---
 .../en/modules/help/patroncards/image-manage.tt    |    8 +++++--
 .../prog/en/modules/patroncards/image-manage.tt    |   11 +++++----
 t/HtmlTags.t                                       |   25 ++++++++++++++++++++
 5 files changed, 52 insertions(+), 19 deletions(-)
 copy Koha/Template/Plugin/{KohaDates.pm => HtmlTags.pm} (67%)
 create mode 100755 t/HtmlTags.t


hooks/post-receive
-- 
main Koha release repository