]> git.koha-community.org Git - koha.git/commit
Bug 7598: make strings in acquisitions JavaScript translatable
authorOwen Leonard <oleonard@myacpl.org>
Mon, 10 Sep 2012 12:34:33 +0000 (08:34 -0400)
committerChris Hall <followingthepath@gmail.com>
Mon, 16 Sep 2013 08:06:58 +0000 (20:06 +1200)
commiteee0ab1784a87434b10051f8578a4285566df16e
tree26f037e2f9693a6295688e74c7030a0e481f2fc8
parentf33d780e8b52be7f3146db4758a93e95f8d39137
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@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac)
Signed-off-by: Tomas Cohen Arazi <tomascohen@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@gmail.com>
(cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 297e7fa540d8b6eddf5289c37865844dcf258d09)
koha-tmpl/intranet-tmpl/prog/en/js/acq.js
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt