koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en admin/auth...


From: paul poulain
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en admin/auth...
Date: Wed, 27 Jun 2007 13:01:39 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/06/27 13:01:38

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/admin: auth_tag_structure.tmpl 
                                               authtypes.tmpl 
                                               biblio_framework.tmpl 
                                               cities.tmpl 
                                               itemtypes.tmpl 
                                               marctagstructure.tmpl 
                                               roadtype.tmpl 
                                               systempreferences.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/authorities: authorities.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/catalogue: detail.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbiblio.tmpl 
                                                     additem.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/circ: circulation.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/includes: doc-head-close.inc 
                                                  members.js 
        koha-tmpl/intranet-tmpl/prog/en/includes/javascript: members.js 
        koha-tmpl/intranet-tmpl/prog/en/members: memberentryC.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/serials: serials-edit.tmpl 
                                                 subscription-add.tmpl 
                                                 subscription-detail.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/tools: letter.tmpl 

Log message:
        moving the _s() javascript function, that is used by getext for 
translation purposes to doc-head-clos to avoid having to create it everywhere

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl?cvsroot=koha&r1=1.5&r2=1.6

Patches:
Index: admin/auth_tag_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/auth_tag_structure.tmpl       11 Mar 2007 21:08:12 -0000      1.4
+++ admin/auth_tag_structure.tmpl       27 Jun 2007 13:01:36 -0000      1.5
@@ -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) {

Index: admin/authtypes.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/authtypes.tmpl        16 Mar 2007 01:25:08 -0000      1.4
+++ admin/authtypes.tmpl        27 Jun 2007 13:01:36 -0000      1.5
@@ -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) {

Index: admin/biblio_framework.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin/biblio_framework.tmpl 22 May 2007 09:13:55 -0000      1.5
+++ admin/biblio_framework.tmpl 27 Jun 2007 13:01:36 -0000      1.6
@@ -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) {

Index: admin/cities.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/cities.tmpl   11 Mar 2007 21:08:12 -0000      1.2
+++ admin/cities.tmpl   27 Jun 2007 13:01:36 -0000      1.3
@@ -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) {

Index: admin/itemtypes.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin/itemtypes.tmpl        22 May 2007 09:13:55 -0000      1.5
+++ admin/itemtypes.tmpl        27 Jun 2007 13:01:36 -0000      1.6
@@ -249,7 +249,6 @@
 
 
 <script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
 
 function isNotNull(f,noalert) {
        if (f.value.length ==0) {

Index: admin/marctagstructure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin/marctagstructure.tmpl 21 Jun 2007 12:43:57 -0000      1.6
+++ admin/marctagstructure.tmpl 27 Jun 2007 13:01:36 -0000      1.7
@@ -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) {

Index: admin/roadtype.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/roadtype.tmpl 11 Mar 2007 21:08:12 -0000      1.3
+++ admin/roadtype.tmpl 27 Jun 2007 13:01:36 -0000      1.4
@@ -105,7 +105,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) {

Index: admin/systempreferences.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin/systempreferences.tmpl        22 May 2007 09:13:56 -0000      1.6
+++ admin/systempreferences.tmpl        27 Jun 2007 13:01:36 -0000      1.7
@@ -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) {

Index: authorities/authorities.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- authorities/authorities.tmpl        6 Jun 2007 13:08:35 -0000       1.7
+++ authorities/authorities.tmpl        27 Jun 2007 13:01:36 -0000      1.8
@@ -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++ ) {

Index: catalogue/detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- catalogue/detail.tmpl       26 Jun 2007 09:23:02 -0000      1.8
+++ catalogue/detail.tmpl       27 Jun 2007 13:01:37 -0000      1.9
@@ -219,10 +219,10 @@
 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? '));
        }
 
     

Index: cataloguing/addbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cataloguing/addbiblio.tmpl  11 Mar 2007 21:08:12 -0000      1.5
+++ cataloguing/addbiblio.tmpl  27 Jun 2007 13:01:37 -0000      1.6
@@ -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");

Index: cataloguing/additem.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cataloguing/additem.tmpl    11 Mar 2007 21:08:12 -0000      1.5
+++ cataloguing/additem.tmpl    27 Jun 2007 13:01:37 -0000      1.6
@@ -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++ ) {

Index: circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- circ/circulation.tmpl       22 May 2007 09:13:56 -0000      1.14
+++ circ/circulation.tmpl       27 Jun 2007 13:01:37 -0000      1.15
@@ -830,13 +830,6 @@
 <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.
     */

Index: includes/doc-head-close.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- includes/doc-head-close.inc 22 May 2007 09:13:57 -0000      1.5
+++ includes/doc-head-close.inc 27 Jun 2007 13:01:37 -0000      1.6
@@ -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

Index: includes/members.js
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/members.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- includes/members.js 16 Mar 2007 01:25:09 -0000      1.1
+++ includes/members.js 27 Jun 2007 13:01:37 -0000      1.2
@@ -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;

Index: includes/javascript/members.js
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/javascript/members.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- includes/javascript/members.js      9 Mar 2007 14:52:58 -0000       1.7
+++ includes/javascript/members.js      27 Jun 2007 13:01:37 -0000      1.8
@@ -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("/");
       

Index: members/memberentryC.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- members/memberentryC.tmpl   16 Mar 2007 01:25:09 -0000      1.17
+++ members/memberentryC.tmpl   27 Jun 2007 13:01:38 -0000      1.18
@@ -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" -->

Index: serials/serials-edit.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/serials-edit.tmpl   29 May 2007 16:20:54 -0000      1.5
+++ serials/serials-edit.tmpl   27 Jun 2007 13:01:38 -0000      1.6
@@ -285,7 +285,6 @@
     <!--/TMPL_IF-->
 }
 
-function _(s) { return s } // dummy function for gettext
 function Check(f) {
     var total_errors=0;
 //     alert(f.field_value.length);

Index: serials/subscription-add.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- serials/subscription-add.tmpl       23 May 2007 20:00:28 -0000      1.8
+++ serials/subscription-add.tmpl       27 Jun 2007 13:01:38 -0000      1.9
@@ -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'),

Index: serials/subscription-detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- serials/subscription-detail.tmpl    25 Jun 2007 15:02:15 -0000      1.9
+++ serials/subscription-detail.tmpl    27 Jun 2007 13:01:38 -0000      1.10
@@ -382,7 +382,6 @@
     </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) {

Index: tools/letter.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tools/letter.tmpl   11 Mar 2007 21:08:14 -0000      1.5
+++ tools/letter.tmpl   27 Jun 2007 13:01:38 -0000      1.6
@@ -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) {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]