[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-331-g3000869

Wed May 1 13:06:48 CEST 2013

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.12.x has been updated
       via  3000869e566481277458a4e5ebb7cf8979fb13bb (commit)
       via  9f8bf846e3fa90f261aa087aa82c721bd03e4031 (commit)
       via  8e5dd776f3a7927ab3b85ca46f5553c0d47314f7 (commit)
       via  cd58f73b7e75377b90253a4aef1aedc9c7665190 (commit)
      from  20b016beab69c9678133001fe7595d81704c7ce0 (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 3000869e566481277458a4e5ebb7cf8979fb13bb
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Apr 25 09:34:17 2013 -0400

    Bug 10111 - Layout on basket summary page a bit inconsistent

    Some details in the summary of basket information were not marked up
    consistently with others on the page. This patch makes the markup
    consistent for a consistent appearance.

    To test, view a basket in Acquisitions which is part of a basketgroup.
    Information should be displayed consistently for baksets in both open
    and closed basket groups.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Works as expected

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template change only, works nicely.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 72c95fa1ccd7fadadd5e5b73cf4e1a5623f18f89)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 9f8bf846e3fa90f261aa087aa82c721bd03e4031
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Mon Apr 29 13:07:11 2013 -0300

    Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated

    This patch changes
    1) structure and schema for xml files used in MARC21
    006 and 008 value builders.
    2) JavaScript functions used to show value builders.

    Xml processing is enabled in previous patch

    Any translatable string has been moved to an xml element,
    those strings that no need translation remains as xml
    attributes.

    NOTE_1: I do not include as translatable material types
    codes, because those values are restricted in schema
    definition. But this restriction can be removed.

    NOTE_2: Anyone with experience in XML/XSD please
    check the new schema definition.

    NOTE_3: Anyone with experience in the former and
    JavaScript please check xmlControlfield.js

    To test:
    1) Apply the patch
    2) Verify that 006 and 008 value builders show and work
    properly
    3) Update translation files for your favorite language,
    a new set of strings must show up corresponding to
    names and descriptions on value builders.

    Note: messed up patches, sending again.
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests and QA script pass.

    Did regression tests on the plugins for 006 and 008 and could
    spot no differences in behavior of the plugins to before.

    Also tested the translation process and found it working nicely.
    Thank you for fixing this long standing translation bug!
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit b6518e632ddf1c2e97fe9f49d9dd307a3047266b)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 8e5dd776f3a7927ab3b85ca46f5553c0d47314f7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Apr 8 20:10:19 2012 +1200

    Bug 6709 : Patch for testing translating .xml files

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Comment on second patch.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 3588e2820ebdada0befecbb698b93a9aadc8a510)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit cd58f73b7e75377b90253a4aef1aedc9c7665190
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Mon Apr 29 22:31:58 2013 +1200

    Bug 10143 - Fixing license headers

    Some files have the old 59 Temple address instead of the 51 Franklin
    street.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    I see lots more which will need to be corrected as well.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Corrects addresses in 3 files.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit c82facc01216f390a77de6268d75903c0eed7d42)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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

Summary of changes:
 Koha/DateUtils.pm                                  |    4 +-
 Koha/Indexer/Utils.pm                              |    4 +-
 .../intranet-tmpl/prog/en/js/xmlControlfield.js    |   23 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   23 +-
 .../cataloguing/value_builder/marc21_field_006.xml | 1562 ++++++------
 .../cataloguing/value_builder/marc21_field_008.xml | 2566 ++++++++++----------
 .../cataloguing/value_builder/marc21_field_CF.xsd  |   26 +-
 members/statistics.pl                              |    5 +-
 misc/translator/tmpl_process3.pl                   |    2 +-
 9 files changed, 2109 insertions(+), 2106 deletions(-)

hooks/post-receive
-- 
main Koha release repository