[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha1-4-gb1e4db6

[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  b1e4db6be9bbb18c07c16f0eb2ad02867cf938de (commit)
       via  6bf848303fd4a0d827cc688dab907166df701102 (commit)
      from  fa3903fe3d4955e2fd36613a7d7ac7f3a363913a (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 b1e4db6be9bbb18c07c16f0eb2ad02867cf938de
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Sep 23 23:18:34 2013 +0200

    Bug 10935: (follow-up) adding a line break to fix first list item
    
    Without the line break after the include the first entry
    of our list of orders was behind the header row in the first row
    of the spreadsheet.
    
    Adding the line break seems to fix that and translated CSV can
    be exported correctly now.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 6bf848303fd4a0d827cc688dab907166df701102
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Sep 23 17:07:09 2013 +0200

    Bug 10935: fix breakage of CSV acq exports when using a non-English translation
    
    To reproduce:
    - cd misc/translator
    - ./translate update LANG
    - ./translate install LANG
    - go to the Koha mainpage and change the language.
    - go to acqui/basketgroup.pl?booksellerid=XX and try to export a
      basketgroup.
    The headers is followed by the first basketgroup information. There is
    no carriage return.
    
    It looks like it is caused by a routine used by the translator script
    (TmplTokenizer::string_canon).
    
    To test this patch:
    - apply it
    - cd misc/translator
    - ./translate -f update LANG
    - translate headers in your po file
    - ./translate -f install LANG
    - go to acqui/basketgroup.pl?booksellerid=XX and try to export a
      basketgroup.
    - verify that the csv looks good now.
    - same thing for basket.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Good idea and seems to work - just fixing a small glitch
    with the first entry of the list in a follow-up.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt |    1 +
 .../intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt  |    1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basket.tt          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt     |    2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt


hooks/post-receive
-- 
main Koha release repository