From 7303021949775c2bae5ecb2bb424decb1c2da798 Mon Sep 17 00:00:00 2001
From: olivier <>
Date: Mon, 15 Feb 2010 16:56:17 +0000
Subject: [PATCH] fix quick search ; advanced search : fix searching by
 collector, creator and publish date (year range)

---
 fr/LC_MESSAGES/django.mo | Bin 8172 -> 8437 bytes
 fr/LC_MESSAGES/django.po |  73 +++++++++++++++++++++++++++------------
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/fr/LC_MESSAGES/django.mo b/fr/LC_MESSAGES/django.mo
index 5ed08461c97097020302dcc31c78c6fb99ed7f76..e42705f9e641a4d50f59a91863e24d1b863284c1 100644
GIT binary patch
delta 3450
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

delta 3214
zcmYM!eN0zX9LMnkiAaKi@}Lkw@=TBdqG<Sll9&c5NLh(k0Vyh?r733jSC|Q;KiI|c
zp+B^=XhU%^(^k1LSJ+ymX11Pdt=XDc&1u=z>ixOD(>nWo@9Uhyz31V3&*f^#r5VmQ
zqlWA<lrG{X;@}Wt1~4a#3uQvMG1-`hH{%i<ftxV|+i@gz+W!5vzYl}yKW6(+;BeZ5
zI1N9+C}SKG6=6&?9Vs{ri!cXEY=0B-Gp)AWg{ib(K`r0|oQ!8t3k&1I9?Tfjc!_ue
zrsIv6jofMqF`D_!Y$~k8EVh4W#8BEBaTNNH#Tpm2gZ-!-_hKTxjS2V#YJzL1`-8ZN
zsu^KTL?tx`hvFn0#r$TPy<q`rN41!R^|tLtEpQh`;;Xj*gzZ0xvGkuoO?c6I4K+~+
z55;3RYUdd^1`E+qsw${x<yEMiFGZ!U0rkKd)B?7kcHl=1ya#pverpfv{-emxoa7RR
zAKU(msEl4kWoTFw`PYtP7+vou0kxnc)Phn`H;%XMV$`83v+a4-YSeSfP_L*Sm5H^e
z1^Q4M+K$>l7i!#nQRH6>=&?5(K^A9@qXs&SqwzfQGe2?BM1P?&@DHZpP`0HBa!_AU
zA!^)8)N_k%yAgF?Gmgbg4iz097nQm`)C%80O+0AZUm`#ABNu%wf1*+w!A*KD&02t(
zumoeU3UxMC*tXBMpGVE(9HyefaU7HJ9P%?)xafvZX461XsFi1+CY)gVr=uoZgxYZf
zDub&~8QOx%*jD@ZHrw_GbWArD4ZO$R@Dggm9^?R<lc;z35tarS^EGDE9>=!y52+lr
zpjD^^w4gHOLvA&$?e9UIu_LJQUdQ43{s*W`r{hEWhj8+$cawnHK_TX1G3v8vL@lh<
zwq4Ak-HTel1uVj^P??G0A@ygVGLdWB`52+^zlaJyGlz@LLM`eQY(@>>M|}+kkTsfK
zREkfb4(WN+j=sZG{1x?&DVkj<Gx?}-W}-4%iLA{mM@KvHQPI2ZM5SymY5{$ym7l_7
zeBZWzMh);AY9YfoK)P=%YQiMcIJu}-F$*<uH7cVkQD4crc=E4z@25j6-i=Dp8>k(>
zh1%hJsPFZh^;^`$mrx7;8#PfV>C<@esBuzI8_YzFQ-mbPl%k%mNg)3`Ynp6F8)}7n
zQHSLK>L17<>tWP@$4~>li<;;xYQYy!3;o{qUq)r*3hEUFv286d5_SJrhl>7?ib{C_
zY5`@afh$letwK#$huUc~D#fj+h3-Z@_adg?%czM5k-5#Ms8{qm>MZ<$8qWzM@0uV6
zm5FrJt0>{30cuehSdE%+J!%K-sDWJ6!VjSi=bNbU&Y+hGRLU=-KG#q#$(SC{F=bT7
z(Xkwr+73*^eRvBFpbpOus1;vF9lnsHz`IXGEhGcgKLvH)LR3a-Pz$O<Wpq6%6D^*O
zF+Tf;ZKwx3Py@bz8sIh5z(-L7okqQa&yoK}-g^X7s|#gb0B?*=TVI6>h}A?oF_Tcq
zbhte0RRg=3M!lNYOspW9h-QK>%_}pwDoghgj}gkybYeWA-KkU(_Yitr8wkCgwZsI1
z<auQ=*ZT;kol7>+Li|^%Y-NYF9!rQi+ZKz6<-{XI5utZnPN=LTwt6*Vp1|9QWZTwZ
zRe6+H!~9-DmraBYTmi9>(4kY=9>BY%axEp660Kg3F;C(wLa#2@_C1966UD>>#9c%l
zF_qBQu#UKsSg-jPQc-CP;2pjSTTj9q;yGe2v4wbwP|=~)xmZHXCUi*K2%VYvgo?hD
zWvWnu19)H8!_>2g*#Gw*`1~^HoJ52ZD%*(1i8*T6qGt+;TZ!9<XNWRF|3`GPRs2K;
z@w6J0y9qvd@8GJfl26Qi(5nV6K1d<D0!{B)!*vR=lbA?MCR7>%m^(0%aDR!N?~abB
zaJ%C&`*%i^2fNot*7i3<UK!#pi8&aWpPV;wYC&FqXzcc&{_eQXg54eQOWh4gBl{x~
KoDkQa-0&|l><IAy

diff --git a/fr/LC_MESSAGES/django.po b/fr/LC_MESSAGES/django.po
index a8eb303..a724705 100644
--- a/fr/LC_MESSAGES/django.po
+++ b/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-12 14:31+0100\n"
+"POT-Creation-Date: 2010-02-15 17:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,13 +32,13 @@ msgstr "valeur"
 msgid "publisher"
 msgstr "éditeur"
 
-#: models/enum.py:134 models/enum.py:145 models/instrument.py:41
+#: models/enum.py:134 models/enum.py:146 models/instrument.py:41
 #: models/instrument.py:51 models/location.py:50 models/location.py:142
 #: models/media.py:347
 msgid "name"
 msgstr "nom"
 
-#: models/enum.py:144 models/media.py:225
+#: models/enum.py:138 models/enum.py:145 models/media.py:225
 msgid "population / social group"
 msgstr "population / groupe social"
 
@@ -78,7 +78,7 @@ msgstr "type complet"
 msgid "current location"
 msgstr "lieu actuel"
 
-#: models/location.py:57 models/location.py:151
+#: models/location.py:57 models/location.py:151 models/location.py:165
 msgid "authoritative"
 msgstr "officiel"
 
@@ -428,6 +428,7 @@ msgid "Search"
 msgstr "Recherche"
 
 #: templates/telemeta_default/base.html:34
+#: templates/telemeta_default/search_criteria.html:53
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
@@ -473,8 +474,8 @@ msgid "Legal mentions"
 msgstr "Mentions légales"
 
 #: templates/telemeta_default/collection_detail.html:77
-#: templates/telemeta_default/inc/collection_list.html:16
-#: templates/telemeta_default/inc/mediaitem_list.html:15
+#: templates/telemeta_default/inc/collection_list.html:17
+#: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr "Enregistré par"
 
@@ -528,7 +529,7 @@ msgid "List"
 msgstr "Liste"
 
 #: templates/telemeta_default/geo_continents.html:24
-#: templates/telemeta_default/index.html:8
+#: templates/telemeta_default/index.html:9
 msgid "Geographic Navigator"
 msgstr "Navigateur géographique"
 
@@ -538,11 +539,11 @@ msgstr "Navigateur géographique"
 msgid "World"
 msgstr "Monde"
 
-#: templates/telemeta_default/index.html:10
+#: templates/telemeta_default/index.html:11
 msgid "Open the geographic navigator"
 msgstr "Accéder au navigateur géographique"
 
-#: templates/telemeta_default/index.html:13
+#: templates/telemeta_default/index.html:14
 msgid "Musical selection"
 msgstr "Sélection musicale"
 
@@ -551,7 +552,7 @@ msgid "Recording date"
 msgstr "Date d'enregistrement"
 
 #: templates/telemeta_default/mediaitem_detail.html:147
-#: templates/telemeta_default/inc/mediaitem_list.html:17
+#: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
@@ -567,22 +568,50 @@ msgstr "Informations générales"
 msgid "No such item"
 msgstr "Item introuvable"
 
-#: templates/telemeta_default/inc/collection_list.html:6
-#, python-format
-msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s"
-msgstr "Collections %(first_on_page)s à %(last_on_page)s sur %(hits)s"
-
+#: templates/telemeta_default/search_criteria.html:87
 #: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:14
 msgid "Title"
 msgstr "Titre"
 
-#: templates/telemeta_default/inc/collection_list.html:17
-#: templates/telemeta_default/inc/mediaitem_list.html:21
+#: templates/telemeta_default/search_criteria.html:93
+#: templates/telemeta_default/search_results.html:29
+#: templates/telemeta_default/inc/collection_list.html:18
+#: templates/telemeta_default/inc/mediaitem_list.html:22
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/inc/collection_list.html:38
+#: templates/telemeta_default/search_criteria.html:100
+#: templates/telemeta_default/search_criteria.html:119
+#: templates/telemeta_default/search_results.html:31
+#: templates/telemeta_default/search_results.html:38
+msgid "to"
+msgstr "à"
+
+#: templates/telemeta_default/search_criteria.html:112
+#: templates/telemeta_default/search_results.html:36
+msgid "Year of issue"
+msgstr "Année de parution"
+
+#: templates/telemeta_default/search_results.html:6
+msgid "Search results"
+msgstr "Résultats de recherche"
+
+#: templates/telemeta_default/search_results.html:11
+msgid "Search pattern"
+msgstr "Recherche"
+
+#: templates/telemeta_default/inc/collection_list.html:6
+#, python-format
+msgid "Collections %(first_on_page)s to %(last_on_page)s on %(hits)s"
+msgstr "Collections %(first_on_page)s à %(last_on_page)s sur %(hits)s"
+
+#: templates/telemeta_default/inc/collection_list.html:15
+#: templates/telemeta_default/inc/mediaitem_list.html:15
+msgid "Code"
+msgstr "Cote"
+
+#: templates/telemeta_default/inc/collection_list.html:42
 msgid "No collection"
 msgstr "Aucune collection"
 
@@ -595,22 +624,22 @@ msgstr "Métadonnées Dublin Core"
 msgid "Items %(first_on_page)s to %(last_on_page)s on %(hits)s"
 msgstr "Items %(first_on_page)s à %(last_on_page)s sur %(hits)s"
 
-#: templates/telemeta_default/inc/mediaitem_list.html:19
+#: templates/telemeta_default/inc/mediaitem_list.html:20
 msgid "Country/Continent"
 msgstr "Pays/Continent"
 
-#: templates/telemeta_default/inc/mediaitem_list.html:46
+#: templates/telemeta_default/inc/mediaitem_list.html:50
 msgid "No item"
 msgstr "Aucun item"
 
-#: templatetags/telemeta_utils.py:200
+#: templatetags/telemeta_utils.py:203
 #, python-format
 msgid "%(count)d item"
 msgid_plural "%(count)d items"
 msgstr[0] "%(count)d item"
 msgstr[1] "%(count)d items"
 
-#: templatetags/telemeta_utils.py:203
+#: templatetags/telemeta_utils.py:206
 #, python-format
 msgid "%(count)d collection"
 msgid_plural "%(count)d collections"
-- 
2.39.5