[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.03-10-g4c86b57

Wed Sep 6 15:15:15 CEST 2017

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  4c86b575b2ef09cceefa9a2718053e45a71c2b25 (commit)
       via  c6a3c7c39babf64ad916650277ab752e54072916 (commit)
       via  ad4c173bca27de2b05a1c47a3977212f72654c40 (commit)
       via  c4e608d29954195f01ea170ff06d7e8da4814707 (commit)
       via  5b1c9cd3f27d377ddee5635f32fd1a3e2626409c (commit)
      from  70a0ee9b5911a0d28c0312e7e3517bd7a42a6f08 (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 4c86b575b2ef09cceefa9a2718053e45a71c2b25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 10:26:48 2017 -0300

    Bug 18331: POST_CHOMP everywhere!

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3c6168d37436b7312e130f796d47271ff2de77cf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c6a3c7c39babf64ad916650277ab752e54072916
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 8 08:23:57 2017 +0000

    Bug 18331: Followup - fix path to orders_by_budget csv header

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14484ba4234fd1cbb925b5f3a4844da863c65d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ad4c173bca27de2b05a1c47a3977212f72654c40
Author: Lee Jamison <ldjamison at marywood.edu>
Date:   Fri Aug 4 19:27:22 2017 +0000

    Bug 18331: Followup - Fix CSV export (once and for all!)

    Follow-up on Comment 21 to correct the empty_line.inc
    include in basket.tt

    https://bugs.koha-community.org/show_bug.cgi?id=18331

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c4e608d29954195f01ea170ff06d7e8da4814707
Author: Marc Véron <veron at veron.ch>
Date:   Thu Aug 3 17:50:30 2017 +0200

    Bug 18331: Force tt to insert newline to empty_line.inc

    See end of comment #4 and IRC:
    http://irc.koha-community.org/koha/2017-08-03#i_1958062

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a10e5383016a5cb4117719ac858cbe02a53e457b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5b1c9cd3f27d377ddee5635f32fd1a3e2626409c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 12 17:04:47 2017 -0300

    Bug 18331: Fix CSV export (once and for all!)

    I am going to try and explain the problem here in order to make it a
    have-to-read for next changes.

    There are several things to test when and most of the time we break
    something when we try to fix something else.

    You have to test different CSV export, not only one. There are not all
    processed the same way. For instance acqui/csv/basket.tt does not
    contain any strings to translate and the translate script will copy the
    original file as it.
    But reports/csv/orders_by_budget.tt will not! Indeed it contains "TOTAL"
    which will be translated. The generated tt file for the translated
    language will remove all the carriage returns! That's why we cannot rely
    on TT for newlines (contrary to bug 16914 assumption).

    There are two possible methods:
    1/ Fix the translate script
    => Hum... nope
    2/ Remove all carriage returns and make them explicit by including an
    file that only contains 1 carriage return

    This second method is implemented in this patch.

    How it works: Use the PRE_CHOMP "[%-" and POST_CHOMP "-%]"
    (http://www.template-toolkit.org/docs/manual/Config.html#section_PRE_CHOMP_POST_CHOMP)
    to remove all the newlines that could be added by TT in the original
    (en) files. Then include the new_line.inc to add a new line.
    That way original and translated files will behave the same way.
    The BLOCK in the csv_headers avoid to have the newlines added, in any
    cases. For instance: by default we will have an empty line at the end of
    the headers, but the translated headers will not have it.

    Test plan:
    At least 2 signoffs will be needed, please test carefully!
    You will need to generate CSV with at least 2 entries!
    Test with the non-translated interface (en) and with the language you
    want. To test with a translated language you will *have to*:
    - cd misc/translator
    - perl translate update LANG
    - manually edit the po file, remove the fuzzy tags, correctly translate
    the string (do not forget the additional %s in the headers)
    - perl translate install LANG
    1/ Export basket and basketgroup as CSV
    2/ Export late orders as CSV
    3/ Export items (from the item search) as CSV
    4/ Export the 2 reports "Orders by fund" and "Cash register" as CSV

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8403799c7212349bee70090249e3425afd62423b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/includes/csv_headers/acqui/basket.tt       |    2 +-
 .../prog/en/includes/csv_headers/acqui/basketgroup.tt  |    2 +-
 .../prog/en/includes/csv_headers/acqui/lateorders.tt   |    2 +-
 .../en/includes/csv_headers/catalogue/itemsearch.tt    |    2 +-
 .../csv_headers/reports/cash_register_stats.tt         |    2 +-
 .../includes/csv_headers/reports/orders_by_budget.tt   |    2 +-
 .../intranet-tmpl/prog/en/includes/empty_line.inc      |    1 +
 .../intranet-tmpl/prog/en/modules/acqui/csv/basket.tt  |    9 ++++++---
 .../prog/en/modules/acqui/csv/basketgroup.tt           |   10 ++++++----
 .../prog/en/modules/acqui/csv/lateorders.tt            |   10 ++++++----
 .../prog/en/modules/catalogue/itemsearch_csv.tt        |    8 +++++---
 .../prog/en/modules/reports/csv/cash_register_stats.tt |   16 +++++++++-------
 .../prog/en/modules/reports/csv/orders_by_budget.tt    |   14 ++++++++------
 13 files changed, 47 insertions(+), 33 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc

hooks/post-receive
-- 
main Koha release repository