[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.12-85-g5cb5f32

Mon Jul 14 13:02:19 CEST 2014

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  5cb5f3252ed32006778908385609b0aaef46ad8d (commit)
       via  4501ca94a79948994d938b7672de86999f93d7c5 (commit)
       via  9f6f53994d56765354bd1207bcde8e8c21177faf (commit)
      from  72ccff130e565bf6e6ee4c0f8669415eff273ac3 (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 5cb5f3252ed32006778908385609b0aaef46ad8d
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sat Mar 22 12:02:12 2014 -0300

    Bug 10818: improve display and translatability of sysprefs OAI-PMH:ConfFile's description

    This patch correct english display for OAI-PMH:ConfFile syspref,
    and makes it's strings translatable

    To test:
    1) On Administration > System preferences > Web Services
    OAI-PMH:ConfFile syspref doesn't have description before
    file box. Text after that box is not translated.
    2) Choose your prefered language, xx-YY, update po files
    cd misc/translator
    perl translate update xx-YY
    3) Look into xx-YY-pref.po for any occurence of "YAML", there is none
    4) Apply the patch
    5) Update po files again
    6) Look into xx-YY-pref.po, now there are 2 entries
    7) Also reload page from 1) and check for text before
    file box.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works for me as described, only changes YAML pref file.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 15b4f9bbe990224067aea8ac9ddfd02d524c84ad)

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2c50a3c0e01091998dc2e62265a26e2d6ae48029)

commit 4501ca94a79948994d938b7672de86999f93d7c5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Apr 3 08:38:08 2014 -0400

    Bug 12034: standardize alerts referring to lists and list items

    The staff client lists template contains a warning which differs from
    the same warning in the OPAC. The OPAC version is correct because it
    refers to a list rather than a shelf. This patch copies the OPAC version
    to the staff client template.

    This patch also corrects a few of other instances where the incorrect
    term "shelf" is used.

    To test, apply the patch and view a list in the staff client which is
    populated with items. Check the box next to one or more items on the
    list and click the "Remove selected" button. You should see the message,
    "Are you sure you want to remove these items from the list?"

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Work as described, no koha-qa errors

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0f7b89633ed9e5be611a4d6c981bf3065670ba1a)

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 6e4b91178d692778978b0273ddb8ba961fcf1e0f)

commit 9f6f53994d56765354bd1207bcde8e8c21177faf
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Jun 20 14:54:07 2014 +0200

    Bug 12458 - Holidays calendar has wrong colors for weekly and yearly repeatable

    In Tools / Calendar, the colors in the calendar for weekly and yearly repeatable are different from the color of the "Key" legend.

    This patch sets the colors used in the "Key" legend to the cells if calendar.

    Test plan :
    - Go to Tools/Calendar
    - Add a weekly repeatable holiday
    - Check its color in calendar is the same as the text "Holiday repeating weekly"
    => Without this patch, it's green instead of yellow
    - Add a yearly repeatable holiday
    - Check its color in calendar is the same as the text "Holiday repeating yearly"
    => Without this patch, it's yellow instead of orange
    - Check the color of others holydays types are OK

    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    I'd like to see today's date a clearly different color from the
    weekly repeated holiday, because now they're close in color.
    But this patch does exactly what it says and should so I'm signing
    off.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Legend, headings and calendar colors now match.
    No problems found.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2e18152e39198e92cf7411851598760490fb4803)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ee0b57d7d043406fa8022679637241d3424327e6)

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

Summary of changes:
 .../prog/en/modules/admin/preferences/web_services.pref        |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt      |    4 ++--
 .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt    |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

hooks/post-receive
-- 
main Koha release repository