From a51c7df391a9d9f89c9a3aba338028bf9b29ff6d Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sun, 21 Aug 2011 19:58:48 +0200
Subject: [PATCH] Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Content-Type: text/plain; charset="utf-8"

Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
---
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   12 ++++++++----
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 083d0b9..c05a83b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -38,8 +38,11 @@
 </script>
 <script type="text/javascript" language="javascript" src="[% themelang %]/js/amazonimages.js"></script>          [% END %]
 
-<script type="text/javascript" language="javascript"
-[% IF ( opacbookbag ) %]src="[% themelang %]/js/basket.js">[% ELSIF ( virtualshelves ) %]src="[% themelang %]/js/basket.js">[% ELSE %]>var readCookie;[% END %]</script>
+[% IF ( opacbookbag ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
+[% ELSIF ( virtualshelves ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
+[% ELSE %]<script type="text/javascript" language="javascript"> var readCookie;[% END %]
+</script>
+
 <script type="text/javascript" language="javascript">
 	//<![CDATA[
     [% IF ( opacbookbag ) %]var MSG_BASKET_EMPTY = _("Your cart is currently empty");
@@ -74,8 +77,9 @@
          });[% END %]
 	[% IF ( opacuserjs ) %][% opacuserjs %][% END %]
 	//]]>
-</script><script type="text/javascript" language="javascript"
-[% IF ( opacbookbag ) %]src="[% themelang %]/js/basket.js">[% ELSIF ( virtualshelves ) %]src="[% themelang %]/js/basket.js">[% ELSE %]>var readCookie;[% END %]</script>
+[% IF ( opacbookbag ) %]</script><script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
+[% ELSIF ( virtualshelves ) %]</script><script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
+[% ELSE %]</script><script type="text/javascript" language="javascript">var readCookie;[% END %]</script>
 [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/tags.js"></script>[% END %][% ELSE %][% END %]
 [% IF ( GoogleJackets ) %]
 <script type="text/javascript" language="javascript" src="[% themelang %]/js/google-jackets.js"></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
index 48ec21d..1aea582 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="[% lang %]" xml:lang="[% lang %]" [% IF ( bidi ) %]dir="[% bidi %]"[% END %] xmlns="http://www.w3.org/1999/xhtml">
+[% IF ( bidi ) %]<html lang="[% lang %]" xml:lang="[% lang %]" dir="[% bidi %]" xmlns="http://www.w3.org/1999/xhtml">[% ELSE %]<html lang="[% lang %]" xml:lang="[% lang %]" xmlns="http://www.w3.org/1999/xhtml">[% END %]
 <head>
 <title>
-- 
1.7.4.1