[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-845-gb38187d

[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  b38187d8b004316b17d1e67753d638e96bb62bb8 (commit)
       via  f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac (commit)
      from  f01606d89b487d585bf06eae1dd6de6ff138eab9 (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 b38187d8b004316b17d1e67753d638e96bb62bb8
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jul 18 11:30:35 2013 -0400

    Bug 7598: [Follow-up] make strings in acquisitions JavaScript translatable
    
    This follow-up addresses QA comments and moves punctuation and line
    breaks out of the string to be translated.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Sep 10 08:34:33 2012 -0400

    Bug 7598: make strings in acquisitions JavaScript translatable
    
    English strings in acq.js cannot be processed by the translation script.
    This patch moves the strings to the templates to be set as JS variables
    for use by the script.
    
    To test:
    
    - On the uncertain prices page, enter an invalid price and click save.
      You should see a JavaScript alert pointing this out.
    
    - When adding a fund to an existing budget, enter an amount which
      exceeds the amount in the parent budget. You should see a JavaScript
      alert pointing this out. There is a similar function which has been
      corrected, checkBudgetParent(), but I don't know how to trigger it for
      testing.
    
    The closebasketgroup function has been updated but as far as I can tell
    it's not actually in use.
    
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    
    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/acq.js          |   26 +++++++------------
 .../prog/en/modules/acqui/basketgroup.tt           |    6 ++++
 .../prog/en/modules/acqui/uncertainprice.tt        |    1 +
 .../prog/en/modules/admin/aqbudgets.tt             |    8 ++++++
 4 files changed, 25 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository