[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-111-g0dd259b

[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, 3.8.x has been updated
       via  0dd259b461d27cd2365e2b4f6b3a8c350f30f365 (commit)
       via  eee0ab1784a87434b10051f8578a4285566df16e (commit)
      from  f33d780e8b52be7f3146db4758a93e95f8d39137 (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 0dd259b461d27cd2365e2b4f6b3a8c350f30f365
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>
    (cherry picked from commit b38187d8b004316b17d1e67753d638e96bb62bb8)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit bcd6b896ea3e10c73cca4b34d9030024205b784b)

commit eee0ab1784a87434b10051f8578a4285566df16e
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>
    (cherry picked from commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
    
    Conflicts:
    
    	koha-tmpl/intranet-tmpl/prog/en/js/acq.js
    
    Solved.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit 297e7fa540d8b6eddf5289c37865844dcf258d09)

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |   24 +++++++------------
 .../prog/en/modules/acqui/basketgroup.tt           |    6 +++++
 .../prog/en/modules/acqui/uncertainprice.tt        |    1 +
 .../prog/en/modules/admin/aqbudgets.tt             |    8 ++++++
 4 files changed, 24 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository