[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-44-gbd758e2

[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, 3.18.x has been updated
       via  bd758e20f6fa6f624979197f106a438f987afe6e (commit)
       via  a68b6cfbf1a33ed38cfaf3e576ccbff1f09ebc32 (commit)
       via  d7bd08230c7772b2f449bd001eed37accbbd3858 (commit)
      from  a353d139b7079bc98bffa90cf2fbf527cf2d7b54 (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 bd758e20f6fa6f624979197f106a438f987afe6e
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Mon Apr 27 23:54:37 2015 +0000

    Bug 14056: Small punctuation error in description for deleting a holiday
    
    This patch just inserts a semi-colon into the description so that it makes more grammatical sense.
    
    Test plan:
    1) Go to Tools --> Calendar
    2) Create or find a holiday, click on it so the editing options come up
    3) Click on the question mark link to show the description for the option "Delete the exceptions on a range"
    4) Confirm that this now has a semi-colon and reads "... Be careful about your scope range; if it is oversized you could slow down Koha."
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 24e0c1b756945517e4ec02af81bc761128b1a907)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit a68b6cfbf1a33ed38cfaf3e576ccbff1f09ebc32
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue Apr 28 18:24:27 2015 -0300

    Bug 12192: Template toolkit code in HTML attributes is picked up into po-files
    
    This patch gives a partial solution for this problem.
    It ignores strings like "[% something %]", but not
    "[% IF ( value )  %][% value %][% END %]"
    
    We get 100+ strings less to translate
    
    To test:
    1) Update translation files for your preferred language
    2) Apply the patch
    3) Update again
    4) Compare, you must find 100+ strings removed from
    translation files
    
    eg.
    -msgid "[% SEARCH_RESULT.biblionumber |url %]"
    -msgid "[% accepteddate | $KohaDates %]"
    -msgid "[% amountoutstanding | format('%.2f') %]"
    -msgid "[% authtypetext |html %]"
    -msgid "[% barcode_llx |html %]"
    -msgid "[% barcode_lly |html %]"
    -msgid "[% biblio.quantity.length ? biblio.quantity : 1 %]"
    -msgid "[% billingdate | $KohaDates %]"
    -msgid "[% borname |html %]"
    ...
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Verified all strings removed from the po files were
    pure TT.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    (cherry picked from commit 5caa05104dfc30d70be5ea1b17d406b5392d59bc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit d7bd08230c7772b2f449bd001eed37accbbd3858
Author: Marc Véron <veron at veron.ch>
Date:   Sat May 2 21:47:01 2015 +0200

    Bug 14122: Patron card: Software error when creating using borrower_number as parameter from URL
    
    To test prepare an URL like the following:
    
    ...cgi-bin/koha/patroncards/create-pdf.pl?borrower_number=61&template_id=24&layout_id=21&start_card=1
    
    Change the values for borrower_number, template_id and layout_id to something that exists in your system.
    
    Without patch, the URL leads to a software error:
    Can't use an undefined value as a HASH reference at /usr/share/kohaclone/patroncards/create-pdf.pl line 118.
    
    With patch, a PDF with the patron card is created.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: This does NOT deal with the case where borrowernumber,
    template_id, or layout_id are invalid. This only deals with
    the case where they do exist.
    
    Invalid borrowernumber still gives same error.
    Invalid template_id or layout_id gives error on line 111.
    Those are beyond the scope of this bug.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a6247f449a476f9768ad4d28c69587ca1922747a)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt |    2 +-
 misc/translator/xgettext.pl                               |    1 +
 patroncards/create-pdf.pl                                 |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository