[koha-commits] main Koha release repository branch master updated. v17.05.00-40-gdd9da3e

Mon Jun 5 22:21:08 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, master has been updated
       via  dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6 (commit)
       via  279126d710233f7925432ab1f8fa6ae9f947889e (commit)
       via  880c2e19c3c5f10f110fd80a44f0d111b9d05472 (commit)
       via  1c8c84f4be8665d95ededf5174c406e1a63d6529 (commit)
       via  c5726913774ed25c4125e65a12054a00c2f7dd76 (commit)
       via  0ee3249438b85cb47aa9ff623bac4f405df7161f (commit)
       via  5a30dea05b158fd6a77b0495ee047310865072eb (commit)
       via  953504a0769a38a60f379a2e9c72bf7b71814fd0 (commit)
       via  1a023a670c1bf0faffe51faefc42fdd6407c2320 (commit)
       via  17fd5a4ffb6fa92e1ce522ac8f8cf5fdeb343868 (commit)
       via  00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe (commit)
       via  16307c40343cdb0ed4ff69c9c001fc4d9e1a459f (commit)
      from  eddf975cf0244c731f987c64af5126090f73f9f2 (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 dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6
Author: Marc Véron <veron at veron.ch>
Date:   Fri May 26 11:06:56 2017 +0200

    Bug 18675: Translatability: Get rid of [%% in translation for csv-profiles.tt

    Translation tool for file csv-profiles.tt picks following line:
    %s [%% IF csv_profile.encoding == encoding OR NOT csv_profile AND encoding == 'utf8' %%]
    It is is due to a line break inside a template directive. This patch removes it.

    To test:
    - Verify that code change makes sense
    - Apply patch
    - Verify that csv exports behave as before

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 279126d710233f7925432ab1f8fa6ae9f947889e
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 29 20:13:03 2017 +0200

    Bug 18690 - Typos in Koha database description (Table "borrowers")

    This string patch fixes typos in kohastructure.sql as described in initial
    comment.

    To test:
    - Carefully verify that string changes make sense

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 880c2e19c3c5f10f110fd80a44f0d111b9d05472
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>

commit 1c8c84f4be8665d95ededf5174c406e1a63d6529
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>

commit c5726913774ed25c4125e65a12054a00c2f7dd76
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 10:47:48 2017 +0200

    Bug 18695: Translatability: Get rid of [%% INCLUDE in translation for circulation.tt

    The file circ/circulation.tt exposes the following line to translation:
    %s %s [%% INCLUDE 'blocked-fines.inc' fines = chargesamount %%] %s %s
    Translators should not be confronted with code internals.

    This patch fixes it by removing a line break.

    To test:
    - Verify that code change makes sense
    - Run QA tools in newest version (check for line breaks in tt directives)
    - Bonus test: Create a "language" aa-AA (perl translate create aa-AA
      from folder misc/translator, verify that line mentioned above do
      no longer appear in aa-AA-staff-prog.po )

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0ee3249438b85cb47aa9ff623bac4f405df7161f
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 07:13:31 2017 +0200

    Bug 18693: Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc

    The file branch-selector.inc exposes the following line to translation
    (due to newlines insied a tt directive):
    %s %s [%% FOREACH branch IN branches; IF branch.selected; selectall = 0; END; END %%]

    Additionally, export.tt exposes the following line to translation:
    [%% INCLUDE 'branch-selector.inc' branches = libraries %%]

    To test:
    - Apply patch
    - In Staff client, go to Home > Tools > Export data
    - Verify that library selection behaves as before
    - Bonus test: Create a "language" aa-AA (perl translate create aa-AA
      from folder misc/translator, verify that lines mentioned above do
      no longer appear in aa-AA-staff-prog.po
    - Run QA tools (newest version with test for newlines in tt directives)

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5a30dea05b158fd6a77b0495ee047310865072eb
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 11:23:20 2017 +0200

    Bug 18644: Translatability: Get rid of pure template directives in translation for memberentrygen.tt

    Translation for memberentrygen.tt exposes a lot of template directives
    like the following:
    [% UNLESS opduplicate %][% othernames | html %][% END %]
    Translators should not be confronted with such code internals.

    To test:
    - Review code changes
    - Verify that creating / editing patrons works as before
    - Bonus test: Create a "language" aa-AA (perl translate create aa-AA
      from folder misc/translator, verify that lines like mentioned above
      do no longer appear in aa-AA-staff-prog.po

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 953504a0769a38a60f379a2e9c72bf7b71814fd0
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 14:27:56 2017 +0200

    Bug 18682 - Translatability: Get rid of [%% in translation for 2 files av-build-dropbox.inc

    Two files av-build-dropbox.inc has linebreaks inside template directives,
     exposing internals (comments and tt code) to translations as mentioned
    in initial comment.
    Translators should not be confronted with such interal code.

    This patch fixes it.

    To test
    - Verify, that code changes make sense and have no more line breaks insied
      tt directives.
    - Run QA tools in newest version (checking for line breaks inside tt
      directives)
    - Bonus test: Create a "language" aa-AA (perl translate create aa-AA
      from folder misc/translator, verify that lines mentioned above do
      no longer appear in aa-AA-staff-prog.po and in aa-AA-opac-bootstrap.po

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1a023a670c1bf0faffe51faefc42fdd6407c2320
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 17:50:57 2017 +0200

    Bug 18701: Translatability: Get rid of exposed tt directives in matching-rules.tt

    Translation for file matching-rules.tt exposes a lot of template directives.

    Translators should not be confronted with internal code like the following:

    [%% PROCESS norms_select selected_norm=\"none\" id=\"mc_1_src_c_1_n_1_norm\" "name=\"mc_1_src_c_1_n_1_norm\" %%]

    To test:
    - Apply patch
    - Verify that code changes make sense (removes line breaks in directives)
    - Run QA tools in newset version (tests for line breaks in tt)
    - Bonus test: create a new translation e.g. fpr language 'aa-AA', verify
      that such lines no longer appear in po/aa-AA-staff-prog.po
      (for matching-rules.tt)

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 17fd5a4ffb6fa92e1ce522ac8f8cf5fdeb343868
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 18:50:16 2017 +0200

    Bug 18702: Translatability: Get rid of exposed if statement in tt for translated onboardingstep2.tt

    The file onboardingstep2.tt exposes the following to translations:

    "[%% IF (categories && categories.count > 1 ) # This if statement checks if "
    "the categories variable handed to this template # by onboarding.pl has data "
    "in it. If the categories variable does have data # in it this means that the "
    "user has previously imported sample patron category # data and so we do not "
    "need to show them the create patron category screen 1, #instead we can "
    "display a screen with ubtton redirecting the user to step 3 %%] "

    Translators should not be confronted with such internals. This patch removes it

    To test:
    - Verify that code change makes sense
    - Run QA tools
    - Bonus test: Create a new "language" aa-AA and verify that the lines above
      are no longer exposed.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe
Author: Marc Véron <veron at veron.ch>
Date:   Tue May 30 21:10:32 2017 +0200

    Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt

    koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains
    template directives inside a div tag:
    <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]">
    This is exposed in translation tool.

    To test:
    - Carefully examine code changes
    - Apply patch, verify that the directive is no longer exposed (picked for
      po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po
    - If you know where / how this macles is used, verify that it behaves as before

    (Note: New patch, needs new sign off)

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 16307c40343cdb0ed4ff69c9c001fc4d9e1a459f
Author: Marc Véron <veron at veron.ch>
Date:   Sun Jun 4 22:09:14 2017 +0200

    Bug 13747: Fix problems with frequency descriptions containing quotes

    If a serial frequency description contains quotes or is surrounded by
    quotes, the description is empty ("TEST" > empty) or shown without the
    quotes part (TEST "sth" > TEST) on editing the frequency.

    To verify:
    - Create a new frequency with description: "Test"
    - Modify frequency
    - Verify the description field is empty

    To test:
    - Apply patch
    - Try to recreate, verify that the description field is
      correctly filled when editing
    - Test also with a name like: 'A "souble quoted" name'

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 installer/data/mysql/kohastructure.sql             |   30 +++++------
 .../prog/en/includes/av-build-dropbox.inc          |   21 +++-----
 .../prog/en/includes/branch-selector.inc           |   10 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    6 +--
 .../prog/en/modules/admin/matching-rules.tt        |   57 +++++---------------
 .../en/modules/cataloguing/value_builder/macles.tt |    3 +-
 .../prog/en/modules/circ/circulation.tt            |    4 +-
 .../prog/en/modules/members/memberentrygen.tt      |   20 +++----
 .../prog/en/modules/onboarding/onboardingstep2.tt  |   12 ++---
 .../en/modules/serials/subscription-frequencies.tt |    2 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    3 +-
 .../intranet-tmpl/prog/en/modules/tools/export.tt  |    3 +-
 .../bootstrap/en/includes/av-build-dropbox.inc     |   19 +++----
 13 files changed, 71 insertions(+), 119 deletions(-)

hooks/post-receive
-- 
main Koha release repository