Bugzilla – Attachment 27369 Details for
Bug 11227
Staff po files contain some Javascript
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 11227 - Staff po files contain some Javascript
SIGNED-OFF-Bug-11227---Staff-po-files-contain-some.patch (text/plain), 3.19 KB, created by
Owen Leonard
on 2014-04-21 19:17:21 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 11227 - Staff po files contain some Javascript
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2014-04-21 19:17:21 UTC
Size:
3.19 KB
patch
obsolete
>From c5f4e4227fdf1ee04f73ce8341dad5bc5b34965e Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Thu, 3 Apr 2014 10:10:33 -0300 >Subject: [PATCH] [SIGNED-OFF] Bug 11227 - Staff po files contain some > Javascript >Content-Type: text/plain; charset="utf-8" > >This patch rewrites authorities_js.inc so translate >script process it correctly. To that I add ><script></script> at the file > >To test: >1) Update po files for your preffered language > >2) Check occurrence of mergeAuth on staff PO file >or try >egrep -n "Merging with authority: |Cancel merge" >strings appear in a JS func > >3) Apply the patch > >4) Update translations again, chech again, old >strings now begin with #~ (obsoleted) and there >are new entries for the messages > >5) Check functionality provided by script > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/includes/authorities_js.inc | 4 ++++ > .../en/modules/authorities/authorities-home.tt | 2 +- > .../en/modules/authorities/searchresultlist.tt | 2 +- > 3 files changed, 6 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >index d1964d1..4981a39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc >@@ -1,3 +1,5 @@ >+<script type="text/javascript"> >+//<![CDATA[ > function mergeAuth(authid, summary) { > var alreadySelected = $.cookie('auth_to_merge'); > if (alreadySelected !== null) { >@@ -36,3 +38,5 @@ $(document).ready(function () { > mergeAuth($(this).parents('tr').attr('data-authid'), $(this).parents('tr').find('div.authorizedheading').text()); > }); > }); >+//]]> >+</script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >index 558746e..7290744 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >@@ -19,9 +19,9 @@ function searchauthority() { > function confirm_deletion() { // not really implemented, but required by phantom delAuthButton code in authorities-toolbar.inc > return true; > } >-[% INCLUDE 'authorities_js.inc' %] > //]]> > </script> >+[% INCLUDE 'authorities_js.inc' %] > </head> > <body id="auth_authorities_home" class="auth"> > [% INCLUDE 'header.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index 49ba49f..ebe5491 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -36,9 +36,9 @@ function searchauthority() { > window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains"; > } > >-[% INCLUDE 'authorities_js.inc' %] > //]]> > </script> >+[% INCLUDE 'authorities_js.inc' %] > </head> > <body id="auth_searchresultlist" class="auth"> > [% INCLUDE 'header.inc' %] >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11227
:
26793
|
27369
|
27672