From b1dc4e24b668dcdc1edc5fa0cc5f1b65551eab6f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 27 Jun 2007 13:01:36 +0000
Subject: [PATCH] moving the _s() javascript function, that is used by getext
 for translation purposes to doc-head-clos to avoid having to create it
 everywhere

---
 .../prog/en/admin/auth_tag_structure.tmpl     |  1 -
 .../prog/en/admin/authtypes.tmpl              |  1 -
 .../prog/en/admin/biblio_framework.tmpl       |  1 -
 .../intranet-tmpl/prog/en/admin/cities.tmpl   |  1 -
 .../prog/en/admin/itemtypes.tmpl              |  1 -
 .../prog/en/admin/marctagstructure.tmpl       |  1 -
 .../intranet-tmpl/prog/en/admin/roadtype.tmpl | 89 +++++++++----------
 .../prog/en/admin/systempreferences.tmpl      |  1 -
 .../prog/en/authorities/authorities.tmpl      |  1 -
 .../prog/en/catalogue/detail.tmpl             |  4 +-
 .../prog/en/cataloguing/addbiblio.tmpl        |  1 -
 .../prog/en/cataloguing/additem.tmpl          |  1 -
 .../prog/en/circ/circulation.tmpl             |  9 +-
 .../prog/en/includes/doc-head-close.inc       |  3 +
 .../prog/en/includes/javascript/members.js    | 10 +--
 .../intranet-tmpl/prog/en/includes/members.js |  2 -
 .../prog/en/members/memberentryC.tmpl         |  4 +-
 .../prog/en/serials/serials-edit.tmpl         |  1 -
 .../prog/en/serials/subscription-add.tmpl     |  1 -
 .../prog/en/serials/subscription-detail.tmpl  |  1 -
 .../intranet-tmpl/prog/en/tools/letter.tmpl   |  1 -
 21 files changed, 53 insertions(+), 82 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
index 992100fa30..e851ab907b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
@@ -8,7 +8,6 @@
 
 <h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
 <script language="javascript" type="text/javascript">
-    function _(s) { return s } // dummy function for gettext
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     function isNotNull(f,noalert) {
         if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
index 49566b3c44..ca1a07787f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
@@ -7,7 +7,6 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
 	if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl
index 113bc3c69a..c20b6092fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl
@@ -6,7 +6,6 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
     if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl
index a9abb9f70e..15350d5d94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl
@@ -129,7 +129,6 @@
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 <script language="javascript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		function isNotNull(f,noalert) {
 			if (f.value.length == 0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
index dbf731333c..a94910a83c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
@@ -249,7 +249,6 @@ Item Types Administration
 
 
 <script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 
 function isNotNull(f,noalert) {
 	if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
index beba6c5007..76c5cddde1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
@@ -11,7 +11,6 @@
 
 <h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
 <script language="javascript" type="text/javascript">
-    function _(s) { return s } // dummy function for gettext
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     function isNotNull(f,noalert) {
         if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
index 7d3adf8b33..a9fc5b99ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
@@ -105,49 +105,48 @@
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 <script language="javascript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNotNull(f,noalert) {
-			if (f.value.length == 0) {
-		return false;
-			}
-		return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function toUC(f) {
-			var x=f.value.toUpperCase();
-			f.value=x;
-			return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNum(v,maybenull) {
-		var n = new Number(v.value);
-		if (isNaN(n)) {
-			return false;
-			}
-		if (maybenull == 0 && v.value =='') {
-			return false;
-		}
-		return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isDate(f) {
-			var t = Date.parse(f.value);
-			if (isNaN(t)) {
-				return false;
-			}
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function Check(f) {
-			var ok=1;
-			var _alertString="";
-			var alertString2;
-			if (f.road_type.value.length == 0  ) {
-				_alertString += "\n- " + _("Road type");
-				alert(_alertString);	
-			}
-			else{
-			document.Aform.submit();
-			}
-		}
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isNotNull(f,noalert) {
+                if (f.value.length == 0) {
+        return false;
+                }
+        return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull == 0 && v.value =='') {
+                return false;
+        }
+        return true;
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.road_type.value.length == 0  ) {
+                        _alertString += "\n- " + _("Road type");
+                        alert(_alertString);	
+                }
+                else{
+                document.Aform.submit();
+                }
+        }
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
index f2a13a74a2..5df8018850 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
@@ -8,7 +8,6 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="JavaScript" type="text/javascript">
-        function _(s) { return s } // dummy function for gettext
         //
         function isNotNull(f,noalert) {
             if (f.value.length ==0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
index 4ff89b1db9..0ee7fefc5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
@@ -124,7 +124,6 @@
 </fieldset>
 
 <script language="JavaScript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
 	for (i=0; i < 10 ; i++ ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
index ee81c53b80..a6c34eb107 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
@@ -219,10 +219,10 @@ function Dopop(link) {
 function confirm_deletion(count) {
         var is_confirmed;
 	if (count>0){
-		    is_confirmed= alert('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio');
+		    is_confirmed= alert(_('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio'));
 		    }
         else{
-		    is_confirmed= confirm('Are you sure you want to delete this biblio? ');
+		    is_confirmed= confirm(_('Are you sure you want to delete this biblio? '));
 	}
 
     
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
index f0c226f8ab..3e3a842075 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
@@ -151,7 +151,6 @@
 function loading(){
 	document.getElementById("loading").style.display = "none";
 }
-function _(s) { return s } // dummy function for gettext
 function confirmnotdup(){
 	document.getElementById("confirm_not_duplicate").value = 1;
 	var checkform =	document.getElementById("f");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
index 137be912ec..dd2d21478b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
@@ -79,7 +79,6 @@
     </form>
 
 <script language="JavaScript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
     for (i=10; i < 11 ; i++ ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
index f77ad1a03b..33c724a6bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
@@ -828,14 +828,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
 <!--/TMPL_IF -->
 
 <script type="text/JavaScript" language="JavaScript">
-    
-    /**
-    *  _(s)
-    *  This function is used to localised.
-    */
-    function _(s) {
-        return s;
-    }
+
     /**
     *  MoreBorrowerDetails();
     *  This function displays or not borrower information.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index cb1e199f36..c24098a60d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -13,3 +13,6 @@
 </style>
 </head>
 <body>
+<script language="JavaScript" type="text/javascript">
+    function _(s) { return s } // dummy function for gettext
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js b/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
index da2338fe5f..3f2adb1d9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js
@@ -1,17 +1,11 @@
 <script language="JavaScript" type="text/javascript">
 
-/**
- *  _(s)
- *  This function is used just for localisation
- */
-function _(s) { return s; }
-
 function CheckDate(field) {
 var d = field.value;
 if (d!="") {
        // this function checks id date is like JJ/MM/AAAA
-      var amin = 1900; // année mini
-      var amax = 2100; // année maxi
+      var amin = 1900; // ann�e mini
+      var amax = 2100; // ann�e maxi
       
       var date = d.split("/");
       
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members.js b/koha-tmpl/intranet-tmpl/prog/en/includes/members.js
index 7f3e9d4dd6..369fc89269 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members.js
@@ -1,5 +1,3 @@
-function _(s) { return s; }
-
 // this function checks id date is like DD/MM/YYYY
 function CheckDate(field) {
 var d = field.value;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index 06f901d343..5abd9a7249 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -6,9 +6,7 @@
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<script language="javascript" type="text/javascript">
-    function _(s) { return s } // dummy function for gettext
-</script>
+
 	<!-- TMPL_IF NAME="add" -->
 	<h1>
 		Add child borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
index 820c3e6a47..9f681e0422 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
@@ -285,7 +285,6 @@ function barcode_check(){
     <!--/TMPL_IF-->
 }
 
-function _(s) { return s } // dummy function for gettext
 function Check(f) {
     var total_errors=0;
 //	alert(f.field_value.length);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index 94baf759e9..e4a676eb9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@ -17,7 +17,6 @@
 
 <script type="text/javascript" language="javascript">
 <!--
-    function _(s) { return s } // dummy function for gettext
 
 // the english words used in display purposes
 var text = new Array(_('Number'),_('Volume'),_('Issue'),_('Month'),_('Week'),_('Starting with:'),_('Rollover at:'),_('Choose Hemisphere:'),_('Northern'),_('Southern'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
index 1735e8725b..de6ccf0b04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
@@ -382,7 +382,6 @@ function irregularity(){
     </div>
 </div>
 <script type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 function confirm_deletion() {
     var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
     if (is_confirmed) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
index a136eaa69f..d5576f96d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
@@ -44,7 +44,6 @@
 	
 	<!-- TMPL_IF NAME="add_form" -->
 	<script language="javascript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		function isNotNull(f,noalert) {
 			if (f.value.length ==0) {
-- 
2.39.5