From 29ac21862a9b5065cee090f3626d0efd543289de Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 25 May 2007 16:27:58 +0000 Subject: [PATCH] updated french translation + improved & fixed default zebra config files --- .../prog/fr/acqui/booksellers.tmpl | 2 +- .../prog/fr/catalogue/ISBDdetail.tmpl | 23 ++++++-- .../prog/fr/catalogue/results.tmpl | 1 + .../prog/fr/serials/subscription-add.tmpl | 4 +- .../prog/fr/serials/subscription-detail.tmpl | 8 +-- misc/zebra/ccl.properties | 2 +- misc/zebra/default.idx | 1 - misc/zebra/sort-string-utf_french.chr | 56 ++++++++++--------- 8 files changed, 57 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl index e96007fced..54eda96d81 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/acqui/booksellers.tmpl @@ -24,7 +24,7 @@ - Commande reçue + Réceptionner colis diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl index 2e58c9a65a..98cc291a04 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/ISBDdetail.tmpl @@ -19,10 +19,25 @@ 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?'); - if (is_confirmed) { - window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&biblionumber="; + +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="; + } + else{ + window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&biblionumber="; + } + } } diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl index 95208b6da0..fee42f6957 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl @@ -244,6 +244,7 @@ - ; - + vol : ; (modifié le ) diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl index 71d9f6f76f..8b2831fd25 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl @@ -674,8 +674,8 @@ function check_input(e){ - " size="8"> (" disabled readonly>) Rechercher notice biblio | - Créer une notice + " size="8"> (" disabled readonly>) Rechercher notice biblio | + Créer une notice diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl index fd835aa5a6..ac96d504e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl @@ -138,7 +138,7 @@ function irregularity(){

Abonnement N°

L'abonnement va expirer. Il faut le renouveller.
- ">Modifier ">Dupliquer "> &serstatus=1">Bulletiner">Etat de collection + ">Edit ">Duplicate ">Renew &serstatus=1">Receive ">Serial Collection ">Modifier la liste de circulation @@ -209,7 +209,7 @@ function irregularity(){

- Numéro + Number only Volume, Numéro, Fascicule @@ -231,7 +231,7 @@ function irregularity(){

- + - +

Commence par :

  @@ -244,7 +244,7 @@ function irregularity(){

Retour :

    diff --git a/misc/zebra/ccl.properties b/misc/zebra/ccl.properties index 9c4b5b47fc..bc0100918f 100644 --- a/misc/zebra/ccl.properties +++ b/misc/zebra/ccl.properties @@ -57,7 +57,7 @@ ab Abstract # 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 diff --git a/misc/zebra/default.idx b/misc/zebra/default.idx index 2d4b39faff..c88e83684b 100644 --- a/misc/zebra/default.idx +++ b/misc/zebra/default.idx @@ -8,7 +8,6 @@ index w completeness 0 position 1 -alwaysmatches 1 charmap sort-string-utf.chr # Phrase index diff --git a/misc/zebra/sort-string-utf_french.chr b/misc/zebra/sort-string-utf_french.chr index a33fa76805..cff3d22905 100644 --- a/misc/zebra/sort-string-utf_french.chr +++ b/misc/zebra/sort-string-utf_french.chr @@ -2,41 +2,44 @@ # # $Id$ +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 (ä) ä -map (æ) æ -map (ø) ø -map (å) å -map (ö) ö -map (Ä) Ä -map (&Aelig;) Æ -map (Ø) Ø -map (Å) Å -map (Ö) Ö - -map (âàáäÂÀÂ) a -map (êèéëÊÈÉË) e -map (îïíÎÏ) i -map (ôöóÔÖ) o -map (ûùüÛÜ) u -map (ç) c -#map (y) i +map (ä) ä +map (æ) æ +map (ø) ø +map (å) Ã¥ +map (ö) ö +map (Ä) Ä +map (&Aelig;) Æ +map (Ø) Ø +map (Å) Å +map (Ö) Ö + +map âàáäÂÀ a +map êèéëÊÈÉË e +map îïíÎÏ i +map ôöóÔÖ o +map ûùüÛÜ u +map ç c +#map y i #map (Aa) (AA) @@ -47,5 +50,4 @@ map (^Les\s) @ map (^Un\s) @ map (^Une\s) @ map (^De\s) @ -map (^Des\s) @ - +map (^Des\s) @ \ No newline at end of file -- 2.39.2