[koha-commits] main Koha release repository branch master updated. v3.14.00-646-g5da480b

[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  5da480b61b689c7497d386fdd0b9bd30f260d2db (commit)
      from  b78596311bb23eb4e81356cc07c12868d9a90b96 (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 5da480b61b689c7497d386fdd0b9bd30f260d2db
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Mar 27 00:32:33 2014 -0300

    Bug 11993: fix untranslatable confirm popup in request.tt
    
    This patch makes confirm popup text translatable. It implements a
    similar function as used on OPAC deleteConfirm() and a JS var message.
    
    This function, or variants, can also be found on other files on intranet,
    I think that the only valid places are staff-global.js and help-top.inc
    
    Redefinitions of this function:
    prog/en/modules/serials/subscription-frequencies.tt:6
    prog/en/modules/tools/marc_modification_templates.tt:158
    prog/en/modules/virtualshelves/shelves.tt:92
    
    Last case is a little different
    
    To test:
    
    1) Confirm that the "cancel hold" link correctly prompts for
       confirmation:
       a) Place an item-level hold on a title.
       b) Check in the item and confirm the hold.
       c) Return to the place hold screen for that title and submit another
          patron to place a hold for.
       d) On the place hold screen for that patron, look at the table of
          items. There should be a "cancel hold" link next to the item for
          which the hold was confirmed in step (b).
       e) Click "cancel hold."  You should see a confirmation message.
          Cancelling this dialog should cancel the operation. Confirming it
          should cancel the hold.
    
    2) Check the string is not present on staff PO file
    3) Apply the patch
    4) Update translation files (cd misc/translator; perl translate update
       xx-YY)
    5) Verify the string is now present
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js         |    6 +++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository