[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.04-22-gdbdaa04

[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.10.x has been updated
       via  dbdaa041d4f1bcce7009ee78024dd200e8d5694f (commit)
       via  b4c637c4e62285afa7b8859b1d8979f1d6ff455a (commit)
       via  2348c3ac54d85d5491cd75c1ada516f4c5df7e36 (commit)
       via  f7ef6031d5d784240973676e019dbadf1f988793 (commit)
      from  9cf40a72ba2f8b206717e19e703506970cedfef2 (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 dbdaa041d4f1bcce7009ee78024dd200e8d5694f
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Nov 28 17:51:03 2012 +0100

    Bug 8942: Translation process breaks javascript (followup 2)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Tested all changes. Functionality is unchanged. Thanks for the taking
    the extra effort to move alert strings into variables.
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit b4c637c4e62285afa7b8859b1d8979f1d6ff455a
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Nov 28 16:10:09 2012 +0100

    Bug 8942: Translation process breaks javascript (followup 1)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Tested all effected functions. No change in functionality.
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 2348c3ac54d85d5491cd75c1ada516f4c5df7e36
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Nov 28 15:37:22 2012 +0100

    Bug 8942: Translation process breaks javascript
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    I tested most scripts affected by this patch and visually verified
    all changes. Functionality is unaffected.
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f7ef6031d5d784240973676e019dbadf1f988793
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Sat Feb 2 19:59:42 2013 +1300

    Bug 8942 : Adding a test to make sure we don't use single quotes for js
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Tested by adding single quotes to a translation-escaped string.
    Test correctly failed it.

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

Summary of changes:
 .../intranet-tmpl/prog/en/includes/calendar.inc    |   24 ++++++++++----------
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   13 +++++++---
 .../prog/en/includes/members-toolbar.inc           |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/ajax.js         |    8 +++---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   10 ++++----
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |    4 +-
 .../en/modules/admin/item_circulation_alerts.tt    |    8 +++---
 .../prog/en/modules/cataloguing/merge.tt           |    4 +-
 .../prog/en/modules/labels/label-manage.tt         |    4 +-
 .../prog/en/modules/members/moremember.tt          |    4 +-
 .../prog/en/modules/offline_circ/list.tt           |    4 +-
 .../prog/en/modules/offline_circ/process_koc.tt    |    2 +-
 .../prog/en/modules/patroncards/manage.tt          |    8 +++---
 .../prog/en/modules/reserve/request.tt             |    8 +++---
 .../prog/en/modules/serials/claims.tt              |    8 +++---
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |    4 +-
 .../prog/en/modules/tools/holidays.tt              |    8 +++---
 .../prog/en/modules/tools/manage-marc-import.tt    |    4 ++-
 .../prog/en/modules/tools/quotes-upload.tt         |   12 +++++-----
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |   14 ++++++-----
 .../prog/en/modules/tools/stage-marc-import.tt     |    2 +-
 .../prog/en/modules/tools/upload-images.tt         |    2 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |   14 ++++++-----
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    2 +-
 .../prog/en/modules/opac-results-grouped.tt        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt |    2 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    6 ++--
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    4 +-
 xt/single_quotes.t                                 |    1 -
 36 files changed, 111 insertions(+), 99 deletions(-)


hooks/post-receive
-- 
main Koha release repository