[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/fr/acqui/book...

paul poulain paul at koha-fr.org
Fri May 25 18:27:59 CEST 2007 

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/05/25 16:27:59

Modified files:
	koha-tmpl/intranet-tmpl/prog/fr/acqui: booksellers.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/catalogue: ISBDdetail.tmpl 
	                                           results.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/includes/calendar: 
	                                                   calendar-setup.js 
	                                                   calendar.js 
	koha-tmpl/intranet-tmpl/prog/fr/serials: subscription-add.tmpl 
	                                         subscription-detail.tmpl 
	misc/zebra     : ccl.properties default.idx 
	                 sort-string-utf_french.chr 

Log message:
	updated french translation + improved & fixed default zebra config files

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/ccl.properties?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/default.idx?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/sort-string-utf_french.chr?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl	23 May 2007 09:55:27 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl	25 May 2007 16:27:58 -0000	1.2
@@ -24,7 +24,7 @@
 				<!-- /TMPL_IF -->
 			</td>
 			<td>
-				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Commande reçue</a>
+				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Réceptionner colis</a>
 			</td>
 			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
 			<td>

Index: koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl	23 May 2007 09:55:32 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl	25 May 2007 16:27:58 -0000	1.2
@@ -19,11 +19,26 @@
 function Dopop(link) {
     newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
-function confirm_deletion() {
-    var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+
+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');
+		    }
+        else{
+		    is_confirmed= confirm('Are you sure you want to delete this biblio? ');
+	}
+
+    
     if (is_confirmed) {
+        if (count>0){
+// 	window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+	}
+	else{
         window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
     }
+		
+    }
 }
 
 </script>

Index: koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl	23 May 2007 09:55:33 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl	25 May 2007 16:27:58 -0000	1.2
@@ -244,6 +244,7 @@
                                         <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+					<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="timestamp" --> <i>(modifié le <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->

Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js	23 May 2007 16:25:02 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js	25 May 2007 16:27:58 -0000	1.2
@@ -19,7 +19,7 @@
  * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.1 2007/05/23 16:25:02 tipaul Exp $
+// $Id: calendar-setup.js,v 1.2 2007/05/25 16:27:58 tipaul Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar

Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js	23 May 2007 16:25:02 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js	25 May 2007 16:27:58 -0000	1.2
@@ -10,7 +10,7 @@
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.1 2007/05/23 16:25:02 tipaul Exp $
+// $Id: calendar.js,v 1.2 2007/05/25 16:27:58 tipaul Exp $
 
 /** The Calendar object constructor. */
 Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {

Index: koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl	23 May 2007 09:55:43 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl	25 May 2007 16:27:58 -0000	1.2
@@ -674,8 +674,8 @@
         <tr>
             <td><label>Notice bibliographique</label></td>
             <td>
-                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Rechercher notice biblio</a> |
-                <!--TMPL_UNLESS Name="mod"--><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Créer une notice</a><!--/TMPL_UNLESS-->
+                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Rechercher notice biblio</a> <!--TMPL_UNLESS Name="mod"--> |
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Créer une notice</a><!--/TMPL_UNLESS-->
             </td>
         </tr>
         <tr>

Index: koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl	23 May 2007 09:55:43 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl	25 May 2007 16:27:58 -0000	1.2
@@ -138,7 +138,7 @@
     <h1>Abonnement N°<!--TMPL_VAR name="subscriptionid"--></h1>
     <!--TMPL_IF Name="abouttoexpire"--><div class="problem">L'abonnement va expirer. Il faut le renouveller.</div><!--/TMPL_IF-->
     <div id="action">
-        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Modifier</a> <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Dupliquer</a> <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->"> </a> <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Bulletiner</a><a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Etat de collection</a>
+        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>  <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>  <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renew </a>  <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Receive</a>  <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
         <!-- TMPL_IF NAME="routing" -->
         <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Modifier la liste de circulation</a>
         <!-- TMPL_ELSE -->
@@ -209,7 +209,7 @@
             </p>
             <p><label>Modèle de numérotation : </label>
                 <!-- TMPL_IF name="numberpattern1" -->
-                    Numéro
+                    Number only
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="numberpattern2" -->
                     Volume, Numéro, Fascicule
@@ -231,7 +231,7 @@
                 <!-- /TMPL_IF -->
             </p>
             <table>
-            <tr><td><p><label>Commence par : </label></p></td>
+            <tr><td><p>Commence par : </p></td>
                 <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
             <!--TMPL_IF NAME="lastvalue2"-->
                 <td align="center">&nbsp; 
@@ -244,7 +244,7 @@
                 </td>
             <!--/TMPL_IF-->
             </tr>
-            <tr><td><p><label>Retour : </label></p></td>
+            <tr><td><p>Retour : </p></td>
                 <td align="center">&nbsp;</td>
             <!--TMPL_IF NAME="whenmorethan2"-->
                 <td align="center">&nbsp; 

Index: misc/zebra/ccl.properties
===================================================================
RCS file: /sources/koha/koha/misc/zebra/ccl.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/zebra/ccl.properties	9 Mar 2007 15:47:25 -0000	1.2
+++ misc/zebra/ccl.properties	25 May 2007 16:27:58 -0000	1.3
@@ -1,5 +1,5 @@
 # CCL field mappings
-# $Id: ccl.properties,v 1.2 2007/03/09 15:47:25 tipaul Exp $
+# $Id: ccl.properties,v 1.3 2007/05/25 16:27:58 tipaul Exp $
 # There are four types of lines in a CCL profile: 
 #  1. qualifier specification
 #	qualifier-name   [  attributeset   ,]  type   =   val   [  attributeset   ,]  type   =   val   ...
@@ -57,7 +57,7 @@
 #            of records selected is the union of the sets of records
 #            selected by each of the (appropriate) Use attributes that
 #            the target supports.
-Any 1=1016
+Any 4=6 1=1016
 kw Any
 
 #Anywhere             1035  The record is selected if the

Index: misc/zebra/default.idx
===================================================================
RCS file: /sources/koha/koha/misc/zebra/default.idx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- misc/zebra/default.idx	25 May 2007 09:34:31 -0000	1.3
+++ misc/zebra/default.idx	25 May 2007 16:27:59 -0000	1.4
@@ -1,5 +1,5 @@
 # Zebra indexes as referred to from the *.abs-files.
-#  $Id: default.idx,v 1.3 2007/05/25 09:34:31 tipaul Exp $
+#  $Id: default.idx,v 1.4 2007/05/25 16:27:59 tipaul Exp $
 #
 
 # Traditional word index
@@ -8,7 +8,6 @@
 index w
 completeness 0
 position 1
-alwaysmatches 1
 charmap sort-string-utf.chr
 
 # Phrase index

Index: misc/zebra/sort-string-utf_french.chr
===================================================================
RCS file: /sources/koha/koha/misc/zebra/sort-string-utf_french.chr,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/zebra/sort-string-utf_french.chr	9 Mar 2007 15:47:25 -0000	1.2
+++ misc/zebra/sort-string-utf_french.chr	25 May 2007 16:27:59 -0000	1.3
@@ -1,42 +1,45 @@
 # Generic character map.
 #
-# $Id: sort-string-utf_french.chr,v 1.2 2007/03/09 15:47:25 tipaul Exp $
+# $Id: sort-string-utf_french.chr,v 1.3 2007/05/25 16:27:59 tipaul Exp $
+
+encoding utf-8
 
 # Define the basic value-set. *Beware* of changing this without re-indexing
 # your databases.
-lowercase {0-9}{a-y}üzæäøöå
-uppercase {0-9}{A-Y}ÜZÆÄØÖÅ
+lowercase {0-9}aæäåâàbcdeéêèëfghiîïjklmnoôöpqrstuüûùvwxyŷÿzø
+uppercase {0-9}AÆÄÂÀÅBCDEÊËÉÈFGHIÎÏJKLMNOÖÔPQRSTUÜÛVWXYŶŸZØ
 
 # Breaking characters
 
-# Characters to be considered equivalent for searching purposes.
+space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~
 
-equivalent æä(ae)
-equivalent øö(oe)
-equivalent å(aa)
-#equivalent uü
+# Characters to be considered equivalent for searching purposes.
+equivalent æä(ae)
+equivalent øö(oe)
+equivalent å(aa)
+#equivalent uü
 equivalent y(i)
 
 # Supplemental mappings
 
-map (&auml;)       ä
-map (&aelig;)      æ
-map (&oslash;)     ø
-map (&aring;)      å
-map (&ouml;)       ö
-map (&Auml;)       Ä
-map (&Aelig;)      Æ
-map (&Oslash;)     Ø
-map (&Aring;)      Å
-map (&Ouml;)       Ö
-
-map (âàáäÂÀÂ)		a
-map (êèéëÊÈÉË)		e
-map (îïíÎÏ)		i
-map (ôöóÔÖ)		o
-map (ûùüÛÜ)       u
-map (ç)       c
-#map (y)   i
+map (&auml;)       ä
+map (&aelig;)      æ
+map (&oslash;)     ø
+map (&aring;)      å
+map (&ouml;)       ö
+map (&Auml;)       Ä
+map (&Aelig;)      Æ
+map (&Oslash;)     Ø
+map (&Aring;)      Ã…
+map (&Ouml;)       Ö
+
+map âàáäÂÀÂ		a
+map êèéëÊÈÉË		e
+map îïíÎÏ		i
+map ôöóÔÖ		o
+map ûùüÛÜ       u
+map ç       c
+#map y   i
 
 #map (Aa)	(AA)
 
@@ -48,4 +51,3 @@
 map (^Une\s)     @
 map (^De\s)     @
 map (^Des\s)     @
-

More information about the Koha-cvs mailing list