From e64c52866be5f148874798de7c6fb050f3f0b454 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Thu, 3 Apr 2014 10:10:33 -0300 Subject: [PATCH] Bug 11227: remove some JavaScript from staff PO files This patch rewrites authorities_js.inc so translate script will process it correctly. To do that I added 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, check 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 Signed-off-by: Katrin Fischer Works as described and fixes a translation difficulty. Signed-off-by: Galen Charlton --- koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 4 ++++ .../prog/en/modules/authorities/authorities-home.tt | 2 +- .../prog/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 d1964d1d3d..4981a399af 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 @@ + 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 558746e6ce..72907440e0 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' %] //]]> +[% INCLUDE 'authorities_js.inc' %] [% 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 49ba49f6c0..ebe54911f9 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' %] //]]> +[% INCLUDE 'authorities_js.inc' %] [% INCLUDE 'header.inc' %] -- 2.39.5