From: yomguy Date: Mon, 13 Feb 2012 12:42:34 +0000 (+0100) Subject: search module up X-Git-Tag: 1.3.10~5 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cc86e27e0fe9cc91c6578bcd3cdd5d9d3ff9355b;p=telemeta.git search module up --- diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 697235d1..c29e78a1 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index f2708393..a3eef8eb 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-10 16:16+0100\n" +"POT-Creation-Date: 2012-02-13 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,6 +27,7 @@ msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "" #: models/enum.py:41 models/enum.py:139 models/media.py:455 +#: models/system.py:103 msgid "value" msgstr "" @@ -214,7 +215,7 @@ msgid "reference" msgstr "" #: models/media.py:123 models/media.py:522 models/media.py:541 -#: models/media.py:555 +#: models/system.py:115 msgid "date" msgstr "" @@ -242,11 +243,11 @@ msgstr "" msgid "depositor / contributor" msgstr "" -#: models/media.py:175 models/media.py:638 +#: models/media.py:175 models/media.py:622 msgid "recording year (from)" msgstr "" -#: models/media.py:176 models/media.py:639 +#: models/media.py:176 models/media.py:623 msgid "recording year (until)" msgstr "" @@ -414,8 +415,7 @@ msgstr "" msgid "copy of" msgstr "" -#: models/media.py:362 models/media.py:554 -#: templates/telemeta/mediaitem_detail.html:224 +#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224 #: templates/telemeta/mediaitem_detail_video.html:192 msgid "keywords" msgstr "" @@ -482,7 +482,7 @@ msgstr "" msgid "resource_id" msgstr "" -#: models/media.py:520 models/system.py:54 +#: models/media.py:520 models/system.py:55 msgid "time" msgstr "" @@ -494,72 +494,89 @@ msgstr "" msgid "transcoded" msgstr "" -#: models/media.py:637 +#: models/media.py:621 msgid "collections" msgstr "" -#: models/media.py:649 models/media.py:650 models/media.py:659 -#: models/media.py:676 +#: models/media.py:633 models/media.py:634 models/media.py:643 +#: models/media.py:660 msgid "corpus" msgstr "" -#: models/media.py:669 models/media.py:670 models/media.py:687 +#: models/media.py:653 models/media.py:654 models/media.py:671 msgid "fonds" msgstr "" -#: models/media.py:680 models/media.py:681 +#: models/media.py:664 models/media.py:665 msgid "corpus related media" msgstr "" -#: models/media.py:691 models/media.py:692 +#: models/media.py:675 models/media.py:676 msgid "fonds related media" msgstr "" -#: models/system.py:51 +#: models/system.py:52 msgid "element type" msgstr "" -#: models/system.py:52 +#: models/system.py:53 msgid "element identifier" msgstr "" -#: models/system.py:53 +#: models/system.py:54 msgid "modification type" msgstr "" -#: models/system.py:55 +#: models/system.py:56 msgid "user" msgstr "" -#: models/system.py:84 templates/telemeta/profile_detail.html:36 +#: models/system.py:85 templates/telemeta/profile_detail.html:36 msgid "Institution" msgstr "" -#: models/system.py:85 templates/telemeta/profile_detail.html:37 +#: models/system.py:86 templates/telemeta/profile_detail.html:37 msgid "Department" msgstr "" -#: models/system.py:86 templates/telemeta/profile_detail.html:38 +#: models/system.py:87 templates/telemeta/profile_detail.html:38 msgid "Function" msgstr "" -#: models/system.py:87 templates/telemeta/profile_detail.html:39 +#: models/system.py:88 templates/telemeta/profile_detail.html:39 msgid "Attachment" msgstr "" -#: models/system.py:88 templates/telemeta/profile_detail.html:40 +#: models/system.py:89 templates/telemeta/profile_detail.html:40 msgid "Address" msgstr "" -#: models/system.py:89 templates/telemeta/profile_detail.html:41 +#: models/system.py:90 templates/telemeta/profile_detail.html:41 msgid "Telephone" msgstr "" -#: models/system.py:90 +#: models/system.py:91 msgid "Expiration_date" msgstr "" -#: templates/admin/base.html:21 templates/telemeta/base.html:86 +#: models/system.py:102 +msgid "key" +msgstr "" + +#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313 +#: templates/telemeta/inc/children_list.html:16 +#: templates/telemeta/inc/collection_related.html:38 +#: templates/telemeta/inc/mediaitem_related.html:38 +#: templates/telemeta/inc/resource_list.html:14 +#: templates/telemeta/inc/resource_related.html:38 +msgid "Description" +msgstr "" + +#: models/system.py:118 +msgid "criteria" +msgstr "" + +#: templates/admin/base.html:21 templates/telemeta/base.html:88 #: templates/telemeta/base.html.py:92 msgid "Home" msgstr "" @@ -586,7 +603,7 @@ msgid "Enumerations" msgstr "" #: templates/telemeta/admin_enumerations.html:14 -#: templates/telemeta/lists.html:62 templates/telemeta/mediaitem_add.html:33 +#: templates/telemeta/lists.html:68 templates/telemeta/mediaitem_add.html:33 #: templates/telemeta/mediaitem_copy.html:34 #: templates/telemeta/mediaitem_detail_video.html:295 #: templates/telemeta/mediaitem_edit.html:26 @@ -597,7 +614,7 @@ msgstr "" #: templates/telemeta/inc/collection_related.html:20 #: templates/telemeta/inc/mediaitem_list.html:14 #: templates/telemeta/inc/mediaitem_related.html:20 -#: templates/telemeta/inc/module_revisions.html:13 +#: templates/telemeta/inc/module_revisions.html:17 #: templates/telemeta/inc/resource_list.html:13 #: templates/telemeta/inc/resource_related.html:20 msgid "Title" @@ -626,7 +643,7 @@ msgstr "" msgid "Welcome" msgstr "" -#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:88 +#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87 msgid "Profile" msgstr "" @@ -650,7 +667,7 @@ msgstr "" msgid "Desk" msgstr "" -#: templates/telemeta/base.html:87 views/base.py:264 +#: templates/telemeta/base.html:86 views/base.py:265 msgid "Lists" msgstr "" @@ -761,12 +778,12 @@ msgid "Save" msgstr "" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:434 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:455 msgid "Collection" msgstr "" #: templates/telemeta/collection_detail.html:44 -#: templates/telemeta/lists.html:48 +#: templates/telemeta/lists.html:54 #: templates/telemeta/mediaitem_detail.html:97 #: templates/telemeta/mediaitem_detail.html:224 #: templates/telemeta/mediaitem_detail.html:263 @@ -805,7 +822,7 @@ msgid "Listen to this collection" msgstr "" #: templates/telemeta/collection_detail.html:95 -#: templates/telemeta/lists.html:66 +#: templates/telemeta/lists.html:72 #: templates/telemeta/inc/collection_list.html:17 msgid "Recording period" msgstr "" @@ -817,7 +834,7 @@ msgid "Geographic and cultural informations" msgstr "" #: templates/telemeta/collection_detail.html:126 -#: templates/telemeta/lists.html:65 +#: templates/telemeta/lists.html:71 #: templates/telemeta/inc/collection_list.html:16 #: templates/telemeta/inc/mediaitem_list.html:16 msgid "Recordist" @@ -864,7 +881,7 @@ msgid "Number of items" msgstr "" #: templates/telemeta/collection_detail.html:211 -#: templates/telemeta/lists.html:51 +#: templates/telemeta/lists.html:57 #: templates/telemeta/mediaitem_detail.html:320 #: templates/telemeta/mediaitem_detail_video.html:363 #: templates/telemeta/resource_detail.html:73 @@ -910,7 +927,7 @@ msgstr "" #: templates/telemeta/collection_list.html:17 #: templates/telemeta/enumeration_edit.html:23 -#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:42 +#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:48 #: templates/telemeta/mediaitem_list.html:15 #: templates/telemeta/resource_list.html:13 msgid "Add" @@ -1027,16 +1044,16 @@ msgstr "" msgid "This instrument list is empty" msgstr "" -#: templates/telemeta/lists.html:40 +#: templates/telemeta/lists.html:46 msgid "My playlists" msgstr "" -#: templates/telemeta/lists.html:63 -#: templates/telemeta/inc/module_revisions.html:14 +#: templates/telemeta/lists.html:69 +#: templates/telemeta/inc/module_revisions.html:18 msgid "Type" msgstr "" -#: templates/telemeta/lists.html:64 templates/telemeta/mediaitem_add.html:34 +#: templates/telemeta/lists.html:70 templates/telemeta/mediaitem_add.html:34 #: templates/telemeta/mediaitem_copy.html:35 #: templates/telemeta/mediaitem_edit.html:27 #: templates/telemeta/inc/children_list.html:17 @@ -1046,7 +1063,7 @@ msgstr "" msgid "Code" msgstr "" -#: templates/telemeta/lists.html:67 +#: templates/telemeta/lists.html:73 #: templates/telemeta/search_criteria.html:130 #: templates/telemeta/search_results.html:58 #: templates/telemeta/inc/collection_list.html:18 @@ -1054,12 +1071,12 @@ msgstr "" msgid "Sound" msgstr "" -#: templates/telemeta/lists.html:68 +#: templates/telemeta/lists.html:74 msgid "Action" msgstr "" -#: templates/telemeta/lists.html:82 -#: templates/telemeta/inc/module_revisions.html:36 +#: templates/telemeta/lists.html:88 +#: templates/telemeta/inc/module_revisions.html:40 msgid "deleted" msgstr "" @@ -1078,7 +1095,7 @@ msgstr "" #: templates/telemeta/mediaitem_add.html:5 #: templates/telemeta/mediaitem_copy.html:5 #: templates/telemeta/mediaitem_detail.html:5 -#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:597 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618 msgid "Item" msgstr "" @@ -1182,15 +1199,6 @@ msgstr "" msgid "Preview" msgstr "" -#: templates/telemeta/mediaitem_detail_video.html:313 -#: templates/telemeta/inc/children_list.html:16 -#: templates/telemeta/inc/collection_related.html:38 -#: templates/telemeta/inc/mediaitem_related.html:38 -#: templates/telemeta/inc/resource_list.html:14 -#: templates/telemeta/inc/resource_related.html:38 -msgid "Description" -msgstr "" - #: templates/telemeta/mediaitem_detail_video.html:316 #: templates/telemeta/inc/collection_related.html:43 #: templates/telemeta/inc/mediaitem_related.html:43 @@ -1222,7 +1230,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta/profile_detail.html:8 views/base.py:1367 +#: templates/telemeta/profile_detail.html:8 views/base.py:1388 msgid "User profile" msgstr "" @@ -1369,15 +1377,20 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta/inc/module_revisions.html:12 +#: templates/telemeta/inc/module_revisions.html:16 +#: templates/telemeta/inc/module_searches.html:12 msgid "Date" msgstr "" -#: templates/telemeta/inc/module_revisions.html:15 +#: templates/telemeta/inc/module_revisions.html:19 #: templates/telemeta/inc/user_list.html:6 msgid "User" msgstr "" +#: templates/telemeta/inc/module_searches.html:13 +msgid "Pattern" +msgstr "" + #: templates/telemeta/inc/resource_list.html:7 #, python-format msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s" @@ -1545,14 +1558,14 @@ msgstr "" msgid "Reset my password" msgstr "" -#: templatetags/telemeta_utils.py:250 +#: templatetags/telemeta_utils.py:257 #, python-format msgid "%(count)d item" msgid_plural "%(count)d items" msgstr[0] "" msgstr[1] "" -#: templatetags/telemeta_utils.py:253 +#: templatetags/telemeta_utils.py:260 #, python-format msgid "%(count)d collection" msgid_plural "%(count)d collections" @@ -1567,17 +1580,21 @@ msgstr "" msgid "All last changes" msgstr "" -#: views/base.py:263 views/base.py:433 views/base.py:596 views/base.py:900 -#: views/base.py:1366 +#: util/locale_fix.py:7 +msgid "My searches" +msgstr "" + +#: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921 +#: views/base.py:1387 msgid "Access not allowed" msgstr "" -#: views/base.py:265 views/base.py:435 views/base.py:598 views/base.py:902 -#: views/base.py:1368 +#: views/base.py:266 views/base.py:456 views/base.py:619 views/base.py:923 +#: views/base.py:1389 msgid "" "Please login or contact the website administator to get a private access." msgstr "" -#: views/base.py:1397 +#: views/base.py:1418 msgid "Last changes" msgstr "" diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index 697235d1..c29e78a1 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po index 260dc446..aa764870 100644 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-10 16:16+0100\n" +"POT-Creation-Date: 2012-02-13 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 13ded2d9..ce77d944 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 19f0a4b0..add8750e 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/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: 2012-02-10 16:16+0100\n" +"POT-Creation-Date: 2012-02-13 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -26,6 +26,7 @@ msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "Entrez une durée valide au format HH:MM[:ss]" #: models/enum.py:41 models/enum.py:139 models/media.py:455 +#: models/system.py:103 msgid "value" msgstr "valeur" @@ -214,7 +215,7 @@ msgid "reference" msgstr "référence" #: models/media.py:123 models/media.py:522 models/media.py:541 -#: models/media.py:555 +#: models/system.py:115 msgid "date" msgstr "" @@ -242,11 +243,11 @@ msgstr "titre original / traduction" msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/media.py:175 models/media.py:638 +#: models/media.py:175 models/media.py:622 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" -#: models/media.py:176 models/media.py:639 +#: models/media.py:176 models/media.py:623 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" @@ -415,8 +416,7 @@ msgstr "références éditées" msgid "copy of" msgstr "copie de" -#: models/media.py:362 models/media.py:554 -#: templates/telemeta/mediaitem_detail.html:224 +#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224 #: templates/telemeta/mediaitem_detail_video.html:192 msgid "keywords" msgstr "mots-clés" @@ -484,7 +484,7 @@ msgstr "type de ressource" msgid "resource_id" msgstr "ressource" -#: models/media.py:520 models/system.py:54 +#: models/media.py:520 models/system.py:55 msgid "time" msgstr "heure" @@ -496,72 +496,90 @@ msgstr "auteur" msgid "transcoded" msgstr "" -#: models/media.py:637 +#: models/media.py:621 msgid "collections" msgstr "collections" -#: models/media.py:649 models/media.py:650 models/media.py:659 -#: models/media.py:676 +#: models/media.py:633 models/media.py:634 models/media.py:643 +#: models/media.py:660 msgid "corpus" msgstr "corpus" -#: models/media.py:669 models/media.py:670 models/media.py:687 +#: models/media.py:653 models/media.py:654 models/media.py:671 msgid "fonds" msgstr "fonds" -#: models/media.py:680 models/media.py:681 +#: models/media.py:664 models/media.py:665 msgid "corpus related media" msgstr "média associés" -#: models/media.py:691 models/media.py:692 +#: models/media.py:675 models/media.py:676 msgid "fonds related media" msgstr "média associés" -#: models/system.py:51 +#: models/system.py:52 msgid "element type" msgstr "type d'élément" -#: models/system.py:52 +#: models/system.py:53 msgid "element identifier" msgstr "identifiant de l'élément" -#: models/system.py:53 +#: models/system.py:54 msgid "modification type" msgstr "type de modification" -#: models/system.py:55 +#: models/system.py:56 msgid "user" msgstr "utilisateur" -#: models/system.py:84 templates/telemeta/profile_detail.html:36 +#: models/system.py:85 templates/telemeta/profile_detail.html:36 msgid "Institution" msgstr "Institution" -#: models/system.py:85 templates/telemeta/profile_detail.html:37 +#: models/system.py:86 templates/telemeta/profile_detail.html:37 msgid "Department" msgstr "Département" -#: models/system.py:86 templates/telemeta/profile_detail.html:38 +#: models/system.py:87 templates/telemeta/profile_detail.html:38 msgid "Function" msgstr "Fonction" -#: models/system.py:87 templates/telemeta/profile_detail.html:39 +#: models/system.py:88 templates/telemeta/profile_detail.html:39 msgid "Attachment" msgstr "Rattachement" -#: models/system.py:88 templates/telemeta/profile_detail.html:40 +#: models/system.py:89 templates/telemeta/profile_detail.html:40 msgid "Address" msgstr "Adresse" -#: models/system.py:89 templates/telemeta/profile_detail.html:41 +#: models/system.py:90 templates/telemeta/profile_detail.html:41 msgid "Telephone" msgstr "Téléphone" -#: models/system.py:90 +#: models/system.py:91 msgid "Expiration_date" msgstr "Date d'expiration" -#: templates/admin/base.html:21 templates/telemeta/base.html:86 +#: models/system.py:102 +#, fuzzy +msgid "key" +msgstr "Mot-clé" + +#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313 +#: templates/telemeta/inc/children_list.html:16 +#: templates/telemeta/inc/collection_related.html:38 +#: templates/telemeta/inc/mediaitem_related.html:38 +#: templates/telemeta/inc/resource_list.html:14 +#: templates/telemeta/inc/resource_related.html:38 +msgid "Description" +msgstr "Description" + +#: models/system.py:118 +msgid "criteria" +msgstr "" + +#: templates/admin/base.html:21 templates/telemeta/base.html:88 #: templates/telemeta/base.html.py:92 msgid "Home" msgstr "" @@ -588,7 +606,7 @@ msgid "Enumerations" msgstr "Énumérations" #: templates/telemeta/admin_enumerations.html:14 -#: templates/telemeta/lists.html:62 templates/telemeta/mediaitem_add.html:33 +#: templates/telemeta/lists.html:68 templates/telemeta/mediaitem_add.html:33 #: templates/telemeta/mediaitem_copy.html:34 #: templates/telemeta/mediaitem_detail_video.html:295 #: templates/telemeta/mediaitem_edit.html:26 @@ -599,7 +617,7 @@ msgstr "Énumérations" #: templates/telemeta/inc/collection_related.html:20 #: templates/telemeta/inc/mediaitem_list.html:14 #: templates/telemeta/inc/mediaitem_related.html:20 -#: templates/telemeta/inc/module_revisions.html:13 +#: templates/telemeta/inc/module_revisions.html:17 #: templates/telemeta/inc/resource_list.html:13 #: templates/telemeta/inc/resource_related.html:20 msgid "Title" @@ -628,7 +646,7 @@ msgstr "Pas d'utilisateurs" msgid "Welcome" msgstr "Bienvenue" -#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:88 +#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87 msgid "Profile" msgstr "Profil" @@ -652,7 +670,7 @@ msgstr "Recherche" msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:87 views/base.py:264 +#: templates/telemeta/base.html:86 views/base.py:265 msgid "Lists" msgstr "Listes" @@ -765,12 +783,12 @@ msgid "Save" msgstr "Enregistrer" #: templates/telemeta/collection_detail.html:5 -#: templates/telemeta/collection_detail_dc.html:5 views/base.py:434 +#: templates/telemeta/collection_detail_dc.html:5 views/base.py:455 msgid "Collection" msgstr "Collection" #: templates/telemeta/collection_detail.html:44 -#: templates/telemeta/lists.html:48 +#: templates/telemeta/lists.html:54 #: templates/telemeta/mediaitem_detail.html:97 #: templates/telemeta/mediaitem_detail.html:224 #: templates/telemeta/mediaitem_detail.html:263 @@ -809,7 +827,7 @@ msgid "Listen to this collection" msgstr "Écouter la collection" #: templates/telemeta/collection_detail.html:95 -#: templates/telemeta/lists.html:66 +#: templates/telemeta/lists.html:72 #: templates/telemeta/inc/collection_list.html:17 msgid "Recording period" msgstr "Période d'enregistrement" @@ -821,7 +839,7 @@ msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" #: templates/telemeta/collection_detail.html:126 -#: templates/telemeta/lists.html:65 +#: templates/telemeta/lists.html:71 #: templates/telemeta/inc/collection_list.html:16 #: templates/telemeta/inc/mediaitem_list.html:16 msgid "Recordist" @@ -868,7 +886,7 @@ msgid "Number of items" msgstr "Nombre d'items" #: templates/telemeta/collection_detail.html:211 -#: templates/telemeta/lists.html:51 +#: templates/telemeta/lists.html:57 #: templates/telemeta/mediaitem_detail.html:320 #: templates/telemeta/mediaitem_detail_video.html:363 #: templates/telemeta/resource_detail.html:73 @@ -914,7 +932,7 @@ msgstr "Sonores" #: templates/telemeta/collection_list.html:17 #: templates/telemeta/enumeration_edit.html:23 -#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:42 +#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:48 #: templates/telemeta/mediaitem_list.html:15 #: templates/telemeta/resource_list.html:13 msgid "Add" @@ -1031,16 +1049,16 @@ msgstr "Nom" msgid "This instrument list is empty" msgstr "Cette énumération est vide" -#: templates/telemeta/lists.html:40 +#: templates/telemeta/lists.html:46 msgid "My playlists" msgstr "Mes listes de lecture" -#: templates/telemeta/lists.html:63 -#: templates/telemeta/inc/module_revisions.html:14 +#: templates/telemeta/lists.html:69 +#: templates/telemeta/inc/module_revisions.html:18 msgid "Type" msgstr "Type" -#: templates/telemeta/lists.html:64 templates/telemeta/mediaitem_add.html:34 +#: templates/telemeta/lists.html:70 templates/telemeta/mediaitem_add.html:34 #: templates/telemeta/mediaitem_copy.html:35 #: templates/telemeta/mediaitem_edit.html:27 #: templates/telemeta/inc/children_list.html:17 @@ -1050,7 +1068,7 @@ msgstr "Type" msgid "Code" msgstr "Cote" -#: templates/telemeta/lists.html:67 +#: templates/telemeta/lists.html:73 #: templates/telemeta/search_criteria.html:130 #: templates/telemeta/search_results.html:58 #: templates/telemeta/inc/collection_list.html:18 @@ -1058,12 +1076,12 @@ msgstr "Cote" msgid "Sound" msgstr "Sonore" -#: templates/telemeta/lists.html:68 +#: templates/telemeta/lists.html:74 msgid "Action" msgstr "Action" -#: templates/telemeta/lists.html:82 -#: templates/telemeta/inc/module_revisions.html:36 +#: templates/telemeta/lists.html:88 +#: templates/telemeta/inc/module_revisions.html:40 msgid "deleted" msgstr "supprimé" @@ -1083,7 +1101,7 @@ msgstr "Mot de passe oublié" #: templates/telemeta/mediaitem_add.html:5 #: templates/telemeta/mediaitem_copy.html:5 #: templates/telemeta/mediaitem_detail.html:5 -#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:597 +#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:618 msgid "Item" msgstr "Item" @@ -1187,15 +1205,6 @@ msgstr "Média associés" msgid "Preview" msgstr "Prévisualisation" -#: templates/telemeta/mediaitem_detail_video.html:313 -#: templates/telemeta/inc/children_list.html:16 -#: templates/telemeta/inc/collection_related.html:38 -#: templates/telemeta/inc/mediaitem_related.html:38 -#: templates/telemeta/inc/resource_list.html:14 -#: templates/telemeta/inc/resource_related.html:38 -msgid "Description" -msgstr "Description" - #: templates/telemeta/mediaitem_detail_video.html:316 #: templates/telemeta/inc/collection_related.html:43 #: templates/telemeta/inc/mediaitem_related.html:43 @@ -1227,7 +1236,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta/profile_detail.html:8 views/base.py:1367 +#: templates/telemeta/profile_detail.html:8 views/base.py:1388 msgid "User profile" msgstr "Profil utilisateur" @@ -1374,15 +1383,20 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta/inc/module_revisions.html:12 +#: templates/telemeta/inc/module_revisions.html:16 +#: templates/telemeta/inc/module_searches.html:12 msgid "Date" msgstr "" -#: templates/telemeta/inc/module_revisions.html:15 +#: templates/telemeta/inc/module_revisions.html:19 #: templates/telemeta/inc/user_list.html:6 msgid "User" msgstr "Utilisateur" +#: templates/telemeta/inc/module_searches.html:13 +msgid "Pattern" +msgstr "" + #: templates/telemeta/inc/resource_list.html:7 #, python-format msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s" @@ -1557,14 +1571,14 @@ msgstr "" msgid "Reset my password" msgstr "" -#: templatetags/telemeta_utils.py:250 +#: templatetags/telemeta_utils.py:257 #, 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:253 +#: templatetags/telemeta_utils.py:260 #, python-format msgid "%(count)d collection" msgid_plural "%(count)d collections" @@ -1579,20 +1593,24 @@ msgstr "Mes dernières modifications" msgid "All last changes" msgstr "Toutes les dernières modifications" -#: views/base.py:263 views/base.py:433 views/base.py:596 views/base.py:900 -#: views/base.py:1366 +#: util/locale_fix.py:7 +msgid "My searches" +msgstr "Mes recherches" + +#: views/base.py:264 views/base.py:454 views/base.py:617 views/base.py:921 +#: views/base.py:1387 msgid "Access not allowed" msgstr "Accès non autorisé" -#: views/base.py:265 views/base.py:435 views/base.py:598 views/base.py:902 -#: views/base.py:1368 +#: views/base.py:266 views/base.py:456 views/base.py:619 views/base.py:923 +#: views/base.py:1389 msgid "" "Please login or contact the website administator to get a private access." msgstr "" "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site " "pour obtenir un accès privé." -#: views/base.py:1397 +#: views/base.py:1418 msgid "Last changes" msgstr "Dernières modifications" diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index 99cc4fc6..594a3211 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po index 61688209..60f8d746 100644 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-10 16:16+0100\n" +"POT-Creation-Date: 2012-02-13 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 39227d0b..de4719d8 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -83,9 +83,9 @@ {% if user.is_authenticated %}
  • {% trans "Desk" %}
    • {% else %} diff --git a/telemeta/templates/telemeta/inc/module_searches.html b/telemeta/templates/telemeta/inc/module_searches.html index bb9067c9..de3ee08d 100644 --- a/telemeta/templates/telemeta/inc/module_searches.html +++ b/telemeta/templates/telemeta/inc/module_searches.html @@ -3,7 +3,7 @@

    - rss + rss {% trans title %}

    diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html index 4b08f90a..21b5d491 100644 --- a/telemeta/templates/telemeta/lists.html +++ b/telemeta/templates/telemeta/lists.html @@ -22,17 +22,18 @@ {% block content %}
    - {% block module_user_revisions %} - {% with user_revisions as revisions and "My last changes" as title %} - {% include "telemeta/inc/module_user_revisions.html" %} - {% endwith %} - {% endblock %} {% block module_searches %} {% with searches as searches and "My searches" as title %} {% include "telemeta/inc/module_searches.html" %} {% endwith %} {% endblock %} + + {% block module_user_revisions %} + {% with user_revisions as revisions and "My last changes" as title %} + {% include "telemeta/inc/module_user_revisions.html" %} + {% endwith %} + {% endblock %} {% block module_all_revisions %} {% with revisions as revisions and "All last changes" as title %} diff --git a/telemeta/util/locale_fix.py b/telemeta/util/locale_fix.py index 152784b4..eae085c7 100644 --- a/telemeta/util/locale_fix.py +++ b/telemeta/util/locale_fix.py @@ -4,3 +4,4 @@ from django.utils.translation import ugettext_lazy as _ a = _("My last changes") a = _("All last changes") +a = _("My searches")