Binary file src/jocondelab/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/jocondelab/locale/en/LC_MESSAGES/django.po Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/locale/en/LC_MESSAGES/django.po Wed Oct 09 18:43:09 2013 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-03 08:47-0500\n"
+"POT-Creation-Date: 2013-10-09 11:28-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,104 +114,337 @@
msgstr "Portuguese"
#: settings.py:48
+msgid "Arabic"
+msgstr "Arabic"
+
+#: settings.py:49
+msgid "Russian"
+msgstr "Russian"
+
+#: settings.py:50
msgid "Chinese"
msgstr "Chinese"
-#: settings.py:49
+#: settings.py:51
msgid "Japanese"
msgstr "Japanese"
-#: settings.py:50
+#: settings.py:52
msgid "Catalan"
msgstr "Catalan"
-#: settings.py:51
+#: settings.py:53
msgid "Basque"
msgstr "Basque"
-#: settings.py:52
+#: settings.py:54
msgid "Breton"
msgstr "Breton"
-#: templates/jocondelab/front_base.html:55
+#: settings.py:55
+msgid "Occitan"
+msgstr "Occitan"
+
+#: templates/jocondelab/front_about.html:4
+#: templates/jocondelab/front_about.html:6
+#: templates/jocondelab/front_base.html:93
+#: templates/jocondelab/front_home.html:24
+msgid "À propos"
+msgstr "About"
+
+#: templates/jocondelab/front_about.html:10
+msgid "À propos de JocondeLab, texte à définir"
+msgstr ""
+
+#: templates/jocondelab/front_base.html:63
+#: templates/jocondelab/front_search.html:26
+msgid "Rechercher"
+msgstr "Search"
+
+#: templates/jocondelab/front_base.html:68
+msgid "Changer de langue"
+msgstr "Switch language"
+
+#: templates/jocondelab/front_base.html:71
msgid "Menu"
msgstr "Menu"
-#: templates/jocondelab/front_base.html:58
-#: templates/jocondelab/front_search.html:15
-#: templates/jocondelab/front_search.html:17
-msgid "Multilingual search"
-msgstr "Multilingual search"
+#: templates/jocondelab/front_base.html:89
+#: templates/jocondelab/front_home.html:14
+#: templates/jocondelab/front_home.html:16
+msgid "Accueil"
+msgstr "Home"
+
+#: templates/jocondelab/front_base.html:93
+#: templates/jocondelab/front_home.html:25
+msgid "Tout savoir sur l'expérimentation JocondeLab."
+msgstr ""
+
+#: templates/jocondelab/front_base.html:97
+#: templates/jocondelab/front_home.html:29
+msgid "Découvrez le monde à travers les collections des musées de France."
+msgstr ""
-#: templates/jocondelab/front_base.html:61
-#: templates/jocondelab/front_timeline.html:27
-#: templates/jocondelab/front_timeline.html:29
-msgid "Timeline"
+#: templates/jocondelab/front_base.html:97
+#: templates/jocondelab/front_geo.html:35
+#: templates/jocondelab/front_geo.html:37
+#: templates/jocondelab/front_home.html:28
+msgid "Mappemonde"
+msgstr "World map"
+
+#: templates/jocondelab/front_base.html:101
+#: templates/jocondelab/front_home.html:33
+msgid ""
+"Découvrez les collections des musées de France au fil du temps (période ou "
+"date précise)."
+msgstr ""
+
+#: templates/jocondelab/front_base.html:101
+#: templates/jocondelab/front_home.html:32
+#: templates/jocondelab/front_timeline.html:23
+#: templates/jocondelab/front_timeline.html:25
+msgid "Chronologie"
msgstr "Timeline"
-#: templates/jocondelab/front_base.html:64
-#: templates/jocondelab/front_geo.html:33
-#: templates/jocondelab/front_geo.html:35
-msgid "World map"
-msgstr "World map"
+#: templates/jocondelab/front_base.html:105
+#: templates/jocondelab/front_home.html:37
+msgid ""
+"Choisissez un artiste, un sujet représenté, un domaine ou une époque d'un "
+"simple clic."
+msgstr ""
+
+#: templates/jocondelab/front_base.html:105
+#: templates/jocondelab/front_home.html:36
+#: templates/jocondelab/front_termlist.html:14
+#: templates/jocondelab/front_termlist.html:16
+msgid "Mots-clés"
+msgstr "Keywords"
+
+#: templates/jocondelab/front_base.html:109
+#: templates/jocondelab/front_home.html:41
+msgid "Aidez-nous à décrire le sujet d'une œuvre à l'aide de Wikipédia."
+msgstr ""
+
+#: templates/jocondelab/front_base.html:109
+#: templates/jocondelab/front_describe.html:4
+#: templates/jocondelab/front_describe.html:6
+#: templates/jocondelab/front_home.html:40
+msgid "Contribuer"
+msgstr "Contribute"
+
+#: templates/jocondelab/front_base.html:112
+#: templates/jocondelab/front_home.html:44
+msgid "Travaux étudiants"
+msgstr ""
-#: templates/jocondelab/front_base.html:71
-msgid "Search in contents"
-msgstr "Search in contents"
+#: templates/jocondelab/front_base.html:125
+#: templates/jocondelab/front_legal.html:4
+#: templates/jocondelab/front_legal.html:6
+msgid "Mentions légales"
+msgstr "Legal mentions"
+
+#: templates/jocondelab/front_base.html:128
+#: templates/jocondelab/front_credits.html:4
+#: templates/jocondelab/front_credits.html:6
+msgid "Crédits"
+msgstr "Credits"
+
+#: templates/jocondelab/front_base.html:131
+msgid "Ce site vous est proposé par"
+msgstr "Site proposed by"
+
+#: templates/jocondelab/front_base.html:132
+msgid "Ministère de la Culture et de la Communication"
+msgstr "French Ministry of Culture and Communication"
-#: templates/jocondelab/front_base.html:92
+#: templates/jocondelab/front_base.html:133
+msgid "Logo du Ministère de la Culture et de la Communication"
+msgstr ""
+
+#: templates/jocondelab/front_base.html:135
+msgid "et"
+msgstr "and"
+
+#: templates/jocondelab/front_base.html:136
+msgid "Institut de Recherche et d'Innovation"
+msgstr "Institute of Research and Innovation"
+
+#: templates/jocondelab/front_base.html:137
+msgid "Logo de l'Institut de Recherche et d'Innovation"
+msgstr ""
+
+#: templates/jocondelab/front_base.html:148
#, fuzzy
-msgid "Source: Wikipedia"
+msgid "Source : Wikipedia"
msgstr "Source: Wikipedia"
-#: templates/jocondelab/front_geo.html:42
-msgid "Search for a place"
+#: templates/jocondelab/front_credits.html:10
+msgid "Crédits de JocondeLab"
+msgstr ""
+
+#: templates/jocondelab/front_describe.html:13
+msgid "Décrivez le sujet de cette œuvre"
+msgstr "Describe the subject of this artwork"
+
+#: templates/jocondelab/front_describe.html:18
+msgid "Œuvre précédente"
+msgstr "Previous artwork"
+
+#: templates/jocondelab/front_describe.html:19
+msgid "Œuvre suivante"
+msgstr "Next artwork"
+
+#: templates/jocondelab/front_geo.html:43
+msgid "Rechercher un lieu"
msgstr "Search for a place"
+#: templates/jocondelab/front_geo.html:50
+#: templates/jocondelab/front_search.html:32
+#: templates/jocondelab/front_timeline.html:63
+msgid "Afficher plus de résultats"
+msgstr "Show more results"
+
+#: templates/jocondelab/front_home.html:20
+msgid "Bienvenue sur JocondeLab"
+msgstr "Welcome to JocondeLab"
+
+#: templates/jocondelab/front_legal.html:10
+msgid "Mentions légales de JocondeLab"
+msgstr ""
+
+#: templates/jocondelab/front_notice.html:33
+#: templates/jocondelab/front_notice.html:35
+msgid "Détail d'une notice"
+msgstr "Artwork detail"
+
+#: templates/jocondelab/front_notice.html:44
+#: templates/jocondelab/partial/notice_list.html:22
+#: templates/jocondelab/partial/notice_list.html:31
+msgid "Artiste(s) :"
+msgstr "Artits(s):"
+
#: templates/jocondelab/front_notice.html:50
-#: templates/jocondelab/partial/notice_list.html:13
-msgid "Title:"
+#: templates/jocondelab/partial/notice_list.html:37
+msgid "École :"
+msgstr "School:"
+
+#: templates/jocondelab/front_notice.html:57
+#: templates/jocondelab/partial/notice_list.html:12
+msgid "Titre :"
msgstr "Title:"
-#: templates/jocondelab/front_notice.html:56
-#: templates/jocondelab/partial/notice_list.html:14
-msgid "Denomination:"
-msgstr "Denomination:"
+#: templates/jocondelab/front_notice.html:64
+#: templates/jocondelab/partial/notice_list.html:47
+msgid "Domaine(s) :"
+msgstr "Domain:"
-#: templates/jocondelab/front_notice.html:62
-#: templates/jocondelab/front_notice.html:110
-#: templates/jocondelab/front_notice.html:121
-#: templates/jocondelab/partial/notice_list.html:28
-msgid ":"
-msgstr ":"
+#: templates/jocondelab/front_notice.html:70
+#: templates/jocondelab/partial/notice_list.html:16
+msgid "Désignation :"
+msgstr "Designation:"
#: templates/jocondelab/front_notice.html:76
-msgid "Description:"
-msgstr "Description:"
+#: templates/jocondelab/partial/notice_list.html:57
+msgid "Sujet représenté :"
+msgstr "Represented subject:"
#: templates/jocondelab/front_notice.html:82
-msgid "History:"
-msgstr "History:"
+#: templates/jocondelab/partial/notice_list.html:67
+msgid "Source :"
+msgstr "Source:"
#: templates/jocondelab/front_notice.html:88
-msgid "Conservation location:"
-msgstr "Conservation location:"
+#: templates/jocondelab/partial/notice_list.html:77
+msgid "Datation :"
+msgstr "Date:"
#: templates/jocondelab/front_notice.html:94
-msgid "Datasheet rights:"
-msgstr "Datasheet rights:"
+msgid "Techniques :"
+msgstr "Techniques:"
#: templates/jocondelab/front_notice.html:100
-msgid "Images rights:"
-msgstr "Images rights:"
+msgid "Mesures :"
+msgstr "Measurements:"
+
+#: templates/jocondelab/front_notice.html:106
+#: templates/jocondelab/partial/notice_list.html:90
+msgid "Provenance :"
+msgstr "Origin"
#: templates/jocondelab/front_notice.html:112
-msgid "What do you see in this work?"
-msgstr "What do you see in this work?"
+msgid "Historique :"
+msgstr "History"
+
+#: templates/jocondelab/front_notice.html:118
+msgid "Conservé à :"
+msgstr "Kept in:"
+
+#: templates/jocondelab/front_notice.html:124
+msgid "Copyright notice :"
+msgstr "Datasheet copyright:"
+
+#: templates/jocondelab/front_notice.html:130
+msgid "Crédits photographiques :"
+msgstr "Photo credits:"
+
+#: templates/jocondelab/front_notice.html:137
+msgid "Cette œuvre sur le portail Joconde"
+msgstr "This work on the Joconde portal"
+
+#: templates/jocondelab/front_notice.html:143
+msgid "Ajoutez vos mots-clés"
+msgstr "Add your own keywords"
+
+#: templates/jocondelab/front_notice.html:144
+msgid "Les termes proposés proviennent de Wikipédia."
+msgstr "Proposed keywords are from Wikipedia."
+
+#: templates/jocondelab/front_search.html:13
+#: templates/jocondelab/front_search.html:17
+#, python-format
+msgid "Résultats pour : « %(searchterms_label)s »"
+msgstr "Results for: “%(searchterms_label)s”"
-#: templates/jocondelab/front_notice.html:123
-msgid "Which other work is a source for this work?"
-msgstr "Which other work is a source for this work?"
+#: templates/jocondelab/front_search.html:13
+#: templates/jocondelab/front_search.html:17
+msgid "Recherche"
+msgstr "Search"
+
+#: templates/jocondelab/front_termlist.html:22
+msgid "Nuage"
+msgstr "Term cloud"
+
+#: templates/jocondelab/front_termlist.html:25
+msgid "Artistes"
+msgstr "Artists"
+
+#: templates/jocondelab/front_termlist.html:28
+msgid "Sujets représentés"
+msgstr "Represented subjects"
+
+#: templates/jocondelab/front_termlist.html:31
+msgid "Catégories"
+msgstr "Categories"
+
+#: templates/jocondelab/front_termlist.html:34
+msgid "Époques"
+msgstr "Periods"
+
+#: templates/jocondelab/front_timeline.html:28
+msgid "Recherche par période"
+msgstr "Search by period"
+
+#: templates/jocondelab/front_timeline.html:49
+msgid "Recherche par date"
+msgstr "Search by date"
+
+#: templates/jocondelab/front_timeline.html:53
+msgid "Afficher les contenus de "
+msgstr "Show contents from "
+
+#: templates/jocondelab/front_timeline.html:55
+msgid " à "
+msgstr " to "
#: templates/jocondelab/term_edit.html:73
msgid "prev"
@@ -279,6 +512,18 @@
msgid "valid."
msgstr "valid."
+#: templates/jocondelab/partial/contributed_item.html:6
+msgid "Votez pour ce terme"
+msgstr "Upvote this term"
+
+#: templates/jocondelab/partial/contributed_item.html:7
+msgid "Votez contre ce terme"
+msgstr "Downvote this term"
+
+#: templates/jocondelab/partial/contributed_item.html:9
+msgid "Annulez votre contribution"
+msgstr "Cancel your contribution"
+
#: templates/jocondelab/partial/filter.html:3
msgid "Select term"
msgstr "Select term"
@@ -287,18 +532,6 @@
msgid "Search"
msgstr "Search"
-#: templates/jocondelab/partial/notice_list.html:3
-msgid "results for:"
-msgstr "results for:"
-
-#: templates/jocondelab/partial/notice_list.html:3
-msgid "results"
-msgstr "results"
-
-#: templates/jocondelab/partial/notice_list.html:18
-msgid "Author(s):"
-msgstr "Author(s):"
-
# python-format
#: templates/jocondelab/partial/pagination.html:6
#, python-format
@@ -310,6 +543,51 @@
msgid "previous"
msgstr "previous"
+#: templates/jocondelab/partial/termlist_contents.html:5
+msgid "Termes les plus fréquents"
+msgstr "Most frequent terms"
+
+#: templates/jocondelab/partial/termlist_contents.html:15
+msgid "Classer par ordre alphabétique"
+msgstr "Order alphabetically"
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:7
+#, python-format
+msgid ""
+"\n"
+" <b>%(count)s</b> résultat pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+msgid_plural ""
+"\n"
+" <b>%(count)s</b> résultats pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+msgstr[0] ""
+"\n"
+"<b>%(count)s</b> results for <b>“%(searchterms_label)s”</b>\n"
+" "
+msgstr[1] ""
+"\n"
+"<b>%(count)s</b> result for <b>“%(searchterms_label)s”</b>\n"
+" "
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:13
+#, python-format
+msgid ""
+"Aucun résultat pour <b>« %(searchterms_label)s »</b>"
+msgstr "No result for <b>‘%(searchterms_label)s’</b>"
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:16
+#, python-format
+msgid "<b>%(count)s</b> œuvres des musées de France"
+msgstr "<b>%(count)s</b> artworks from museums of France"
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:32
+#, fuzzy
+msgid "Source : Wikipédia"
+msgstr "Source: Wikipedia"
+
#: templates/registration/login.html:6
msgid "Sorry, that's not a valid username or password."
msgstr "Sorry, that's not a valid username or password."
@@ -318,38 +596,6 @@
msgid "login"
msgstr "login"
-#~ msgid "language"
-#~ msgstr "language"
-
-# Thesaurus Identifiers
-msgctxt "Thesaurus label"
-msgid "AUTR"
-msgstr "Author(s)"
-
-msgctxt "Thesaurus label"
-msgid "DOMN"
-msgstr "Domain(s)"
-
-msgctxt "Thesaurus label"
-msgid "ECOL"
-msgstr "School"
-
-msgctxt "Thesaurus label"
-msgid "EPOQ"
-msgstr "Period or style"
-
-msgctxt "Thesaurus label"
-msgid "LIEUX"
-msgstr "Place(s)"
-
-msgctxt "Thesaurus label"
-msgid "PERI"
-msgstr "Creation time"
-
-msgctxt "Thesaurus label"
-msgid "REPR"
-msgstr "Represented subject"
-
-msgctxt "Thesaurus label"
-msgid "SREP"
-msgstr "Representation source"
+#: views/front_office.py:92
+msgid " ET "
+msgstr " AND "
Binary file src/jocondelab/locale/en/LC_MESSAGES/djangojs.mo has changed
--- a/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po Wed Oct 09 18:43:09 2013 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-03 08:47-0500\n"
+"POT-Creation-Date: 2013-10-09 11:24-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,21 +17,17 @@
"Content-Transfer-Encoding: 8bit\n"
#: static/jocondelab/js/front-geo.js:11
-msgid "Map data © OpenStreetMap contributors"
-msgstr "Map data © OpenStreetMap contributors"
+msgid "© contributeurs de OpenStreetMap"
+msgstr "© OpenStreetMap contributors"
-#: static/jocondelab/js/front-notice.js:229
-msgid "Validating Resource…"
+#: static/jocondelab/js/front-notice.js:189
+#, fuzzy
+msgid "Validation en cours…"
msgstr "Validating Resource…"
-#: static/jocondelab/js/front-notice.js:233
-msgid "Saving contribution…"
-msgstr "Saving contribution…"
-
-#: static/jocondelab/js/front-notice.js:257
-#: static/jocondelab/js/front-notice.js:261
-msgid "No DbPedia resource found for term"
-msgstr "No DbPedia resource found for term"
+#: static/jocondelab/js/front-notice.js:218
+msgid "Validation impossible"
+msgstr "Validation failed"
#: static/jocondelab/js/jocondelab.js:14
msgid "Redirected from: "
Binary file src/jocondelab/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/jocondelab/locale/fr/LC_MESSAGES/django.po Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/locale/fr/LC_MESSAGES/django.po Wed Oct 09 18:43:09 2013 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-12 09:30-0500\n"
+"POT-Creation-Date: 2013-10-09 11:30-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -119,121 +119,338 @@
msgstr "Arabe"
#: settings.py:49
+msgid "Russian"
+msgstr "Russe"
+
+#: settings.py:50
msgid "Chinese"
msgstr "Chinois"
-#: settings.py:50
+#: settings.py:51
msgid "Japanese"
msgstr "Japonais"
-#: settings.py:51
+#: settings.py:52
msgid "Catalan"
msgstr "Catalan"
-#: settings.py:52
+#: settings.py:53
msgid "Basque"
msgstr "Basque"
-#: settings.py:53
+#: settings.py:54
msgid "Breton"
msgstr "Breton"
-#: templates/jocondelab/front_base.html:50
-msgid "Search in contents"
-msgstr "Rechercher dans les notices"
+#: settings.py:55
+msgid "Occitan"
+msgstr "Occitan"
+
+#: templates/jocondelab/front_about.html:4
+#: templates/jocondelab/front_about.html:6
+#: templates/jocondelab/front_base.html:93
+#: templates/jocondelab/front_home.html:24
+msgid "À propos"
+msgstr "À propos"
-#: templates/jocondelab/front_base.html:54
+#: templates/jocondelab/front_about.html:10
+msgid "À propos de JocondeLab, texte à définir"
+msgstr ""
+
+#: templates/jocondelab/front_base.html:63
+#: templates/jocondelab/front_search.html:26
+msgid "Rechercher"
+msgstr "Rechercher"
+
+#: templates/jocondelab/front_base.html:68
+msgid "Changer de langue"
+msgstr "Changer de langue"
+
+#: templates/jocondelab/front_base.html:71
msgid "Menu"
msgstr "Menu"
-#: templates/jocondelab/front_base.html:55
-msgid "Changer de langue"
-msgstr "Changer de langue"
-
-#: templates/jocondelab/front_base.html:67
-#: templates/jocondelab/front_home.html:4
-#: templates/jocondelab/front_home.html:6
+#: templates/jocondelab/front_base.html:89
+#: templates/jocondelab/front_home.html:14
+#: templates/jocondelab/front_home.html:16
msgid "Accueil"
msgstr "Accueil"
-#: templates/jocondelab/front_base.html:70
-#: templates/jocondelab/front_home.html:14
-#: templates/jocondelab/front_search.html:18
-#: templates/jocondelab/front_search.html:20
-msgid "Recherche"
-msgstr "Recherche"
+#: templates/jocondelab/front_base.html:93
+#: templates/jocondelab/front_home.html:25
+msgid "Tout savoir sur l'expérimentation JocondeLab."
+msgstr ""
-#: templates/jocondelab/front_base.html:73
-#: templates/jocondelab/front_home.html:17
-#: templates/jocondelab/front_timeline.html:22
-#: templates/jocondelab/front_timeline.html:24
-msgid "Frise chronologique"
-msgstr "Frise chronologique"
+#: templates/jocondelab/front_base.html:97
+#: templates/jocondelab/front_home.html:29
+msgid "Découvrez le monde à travers les collections des musées de France."
+msgstr ""
-#: templates/jocondelab/front_base.html:76
-#: templates/jocondelab/front_geo.html:31
-#: templates/jocondelab/front_geo.html:33
-#: templates/jocondelab/front_home.html:20
+#: templates/jocondelab/front_base.html:97
+#: templates/jocondelab/front_geo.html:35
+#: templates/jocondelab/front_geo.html:37
+#: templates/jocondelab/front_home.html:28
msgid "Mappemonde"
msgstr "Mappemonde"
-#: templates/jocondelab/front_base.html:103
+#: templates/jocondelab/front_base.html:101
+#: templates/jocondelab/front_home.html:33
+msgid ""
+"Découvrez les collections des musées de France au fil du temps (période ou "
+"date précise)."
+msgstr ""
+"Découvrez les collections des musées de France au fil du temps (période ou "
+"date précise)."
+
+#: templates/jocondelab/front_base.html:101
+#: templates/jocondelab/front_home.html:32
+#: templates/jocondelab/front_timeline.html:23
+#: templates/jocondelab/front_timeline.html:25
+msgid "Chronologie"
+msgstr "Chronologie"
+
+#: templates/jocondelab/front_base.html:105
+#: templates/jocondelab/front_home.html:37
+msgid ""
+"Choisissez un artiste, un sujet représenté, un domaine ou une époque d'un "
+"simple clic."
+msgstr ""
+"Choisissez un artiste, un sujet représenté, un domaine ou une époque d'un "
+"simple clic."
+
+#: templates/jocondelab/front_base.html:105
+#: templates/jocondelab/front_home.html:36
+#: templates/jocondelab/front_termlist.html:14
+#: templates/jocondelab/front_termlist.html:16
+msgid "Mots-clés"
+msgstr "Mots-clés"
+
+#: templates/jocondelab/front_base.html:109
+#: templates/jocondelab/front_home.html:41
+msgid "Aidez-nous à décrire le sujet d'une œuvre à l'aide de Wikipédia."
+msgstr "Aidez-nous à décrire le sujet d'une œuvre à l'aide de Wikipédia."
+
+#: templates/jocondelab/front_base.html:109
+#: templates/jocondelab/front_describe.html:4
+#: templates/jocondelab/front_describe.html:6
+#: templates/jocondelab/front_home.html:40
+msgid "Contribuer"
+msgstr "Contribuer"
+
+#: templates/jocondelab/front_base.html:112
+#: templates/jocondelab/front_home.html:44
+msgid "Travaux étudiants"
+msgstr ""
+
+#: templates/jocondelab/front_base.html:125
+#: templates/jocondelab/front_legal.html:4
+#: templates/jocondelab/front_legal.html:6
+msgid "Mentions légales"
+msgstr "Mentions légales"
+
+#: templates/jocondelab/front_base.html:128
+#: templates/jocondelab/front_credits.html:4
+#: templates/jocondelab/front_credits.html:6
+msgid "Crédits"
+msgstr "Crédits"
+
+#: templates/jocondelab/front_base.html:131
+msgid "Ce site vous est proposé par"
+msgstr "Ce site vous est proposé par"
+
+#: templates/jocondelab/front_base.html:132
+msgid "Ministère de la Culture et de la Communication"
+msgstr "Ministère de la Culture et de la Communication"
+
+#: templates/jocondelab/front_base.html:133
+msgid "Logo du Ministère de la Culture et de la Communication"
+msgstr "Logo du Ministère de la Culture et de la Communication"
+
+#: templates/jocondelab/front_base.html:135
#, fuzzy
-msgid "Source: Wikipedia"
-msgstr "Source : Wikipédia"
+msgid "et"
+msgstr "et"
+
+#: templates/jocondelab/front_base.html:136
+msgid "Institut de Recherche et d'Innovation"
+msgstr "Institut de Recherche et d'Innovation"
+
+#: templates/jocondelab/front_base.html:137
+msgid "Logo de l'Institut de Recherche et d'Innovation"
+msgstr "Logo de l'Institut de Recherche et d'Innovation"
+
+#: templates/jocondelab/front_base.html:148
+#: templates/jocondelab/partial/wrapped_notice_list.html:32
+msgid "Source : Wikipédia"
+msgstr "Source : Wikipédia"
-#: templates/jocondelab/front_geo.html:39
+#: templates/jocondelab/front_credits.html:10
+msgid "Crédits de JocondeLab"
+msgstr ""
+
+#: templates/jocondelab/front_describe.html:13
+msgid "Décrivez le sujet de cette œuvre"
+msgstr "Décrivez le sujet de cette œuvre"
+
+#: templates/jocondelab/front_describe.html:18
+msgid "Œuvre précédente"
+msgstr "Œuvre précédente"
+
+#: templates/jocondelab/front_describe.html:19
+msgid "Œuvre suivante"
+msgstr "Œuvre suivante"
+
+#: templates/jocondelab/front_geo.html:43
msgid "Rechercher un lieu"
msgstr "Rechercher un lieu"
-#: templates/jocondelab/front_geo.html:46
-#: templates/jocondelab/front_search.html:43
-#: templates/jocondelab/front_timeline.html:36
+#: templates/jocondelab/front_geo.html:50
+#: templates/jocondelab/front_search.html:32
+#: templates/jocondelab/front_timeline.html:63
msgid "Afficher plus de résultats"
msgstr "Afficher plus de résultats"
-#: templates/jocondelab/front_home.html:10
+#: templates/jocondelab/front_home.html:20
msgid "Bienvenue sur JocondeLab"
msgstr "Bienvenue sur JocondeLab"
-#: templates/jocondelab/front_home.html:23
-msgid "Liste des termes"
-msgstr "Liste des termes"
+#: templates/jocondelab/front_legal.html:10
+msgid "Mentions légales de JocondeLab"
+msgstr ""
-#: templates/jocondelab/front_home.html:26
-msgid "À propos"
-msgstr "À propos"
+#: templates/jocondelab/front_notice.html:33
+#: templates/jocondelab/front_notice.html:35
+msgid "Détail d'une notice"
+msgstr "Détail d'une notice"
+
+#: templates/jocondelab/front_notice.html:44
+#: templates/jocondelab/partial/notice_list.html:22
+#: templates/jocondelab/partial/notice_list.html:31
+msgid "Artiste(s) :"
+msgstr "Artiste(s) :"
-#: templates/jocondelab/front_notice.html:52
-msgid "Désignation"
-msgstr "Désignation"
+#: templates/jocondelab/front_notice.html:50
+#: templates/jocondelab/partial/notice_list.html:37
+msgid "École :"
+msgstr "École :"
+
+#: templates/jocondelab/front_notice.html:57
+#: templates/jocondelab/partial/notice_list.html:12
+msgid "Titre :"
+msgstr "Titre :"
-#: templates/jocondelab/front_notice.html:59
-msgid "Sujet représenté"
-msgstr "Sujet représenté"
+#: templates/jocondelab/front_notice.html:64
+#: templates/jocondelab/partial/notice_list.html:47
+msgid "Domaine(s) :"
+msgstr "Domaine(s) :"
-#: templates/jocondelab/front_notice.html:66
-msgid "Datation"
-msgstr "Datation"
+#: templates/jocondelab/front_notice.html:70
+#: templates/jocondelab/partial/notice_list.html:16
+msgid "Désignation :"
+msgstr "Désignation :"
#: templates/jocondelab/front_notice.html:76
-msgid "Provenance"
-msgstr "Provenance"
+#: templates/jocondelab/partial/notice_list.html:57
+msgid "Sujet représenté :"
+msgstr "Sujet représenté :"
+
+#: templates/jocondelab/front_notice.html:82
+#: templates/jocondelab/partial/notice_list.html:67
+msgid "Source :"
+msgstr "Source :"
#: templates/jocondelab/front_notice.html:88
-msgid "Visiter sur le portail Joconde"
-msgstr "Visiter sur le portail Joconde"
+#: templates/jocondelab/partial/notice_list.html:77
+msgid "Datation :"
+msgstr "Datation :"
+
+#: templates/jocondelab/front_notice.html:94
+msgid "Techniques :"
+msgstr "Techniques :"
+
+#: templates/jocondelab/front_notice.html:100
+msgid "Mesures :"
+msgstr "Mesures :"
+
+#: templates/jocondelab/front_notice.html:106
+#: templates/jocondelab/partial/notice_list.html:90
+msgid "Provenance :"
+msgstr "Provenance :"
+
+#: templates/jocondelab/front_notice.html:112
+msgid "Historique :"
+msgstr "Historique :"
+
+#: templates/jocondelab/front_notice.html:118
+msgid "Conservé à :"
+msgstr "Conservé à :"
+
+#: templates/jocondelab/front_notice.html:124
+msgid "Copyright notice :"
+msgstr "Copyright notice :"
+
+#: templates/jocondelab/front_notice.html:130
+msgid "Crédits photographiques :"
+msgstr "Crédits photographiques :"
+
+#: templates/jocondelab/front_notice.html:137
+msgid "Cette œuvre sur le portail Joconde"
+msgstr "Cette œuvre sur le portail Joconde"
+
+#: templates/jocondelab/front_notice.html:143
+msgid "Ajoutez vos mots-clés"
+msgstr "Ajoutez vos mots-clés"
+
+#: templates/jocondelab/front_notice.html:144
+msgid "Les termes proposés proviennent de Wikipédia."
+msgstr "Les termes proposés proviennent de Wikipédia."
-#: templates/jocondelab/front_notice.html:95
-#: templates/jocondelab/partial/datasheet_row.html:5
-#: templates/jocondelab/partial/datasheet_row.html:20
-#: templates/jocondelab/partial/notice_list.html:25
-msgid ":"
-msgstr " :"
+#: templates/jocondelab/front_search.html:13
+#: templates/jocondelab/front_search.html:17
+#, python-format
+msgid "Résultats pour : « %(searchterms_label)s »"
+msgstr "Résultats pour : « %(searchterms_label)s »"
+
+#: templates/jocondelab/front_search.html:13
+#: templates/jocondelab/front_search.html:17
+msgid "Recherche"
+msgstr "Recherche"
+
+#: templates/jocondelab/front_termlist.html:22
+msgid "Nuage"
+msgstr "Nuage"
+
+#: templates/jocondelab/front_termlist.html:25
+msgid "Artistes"
+msgstr "Artistes"
+
+#: templates/jocondelab/front_termlist.html:28
+msgid "Sujets représentés"
+msgstr "Sujets représentés"
-#: templates/jocondelab/front_notice.html:97
-msgid "What do you see in this work?"
-msgstr "Que voyez-vous dans cette œuvre ?"
+#: templates/jocondelab/front_termlist.html:31
+msgid "Catégories"
+msgstr "Catégories"
+
+#: templates/jocondelab/front_termlist.html:34
+msgid "Époques"
+msgstr "Époques"
+
+#: templates/jocondelab/front_timeline.html:28
+msgid "Recherche par période"
+msgstr "Recherche par période"
+
+#: templates/jocondelab/front_timeline.html:49
+msgid "Recherche par date"
+msgstr "Recherche par date"
+
+#: templates/jocondelab/front_timeline.html:53
+msgid "Afficher les contenus de "
+msgstr "Afficher les contenus de "
+
+#: templates/jocondelab/front_timeline.html:55
+msgid " à "
+msgstr " à "
#: templates/jocondelab/term_edit.html:73
msgid "prev"
@@ -301,6 +518,18 @@
msgid "valid."
msgstr "validé"
+#: templates/jocondelab/partial/contributed_item.html:6
+msgid "Votez pour ce terme"
+msgstr "Votez pour ce terme"
+
+#: templates/jocondelab/partial/contributed_item.html:7
+msgid "Votez contre ce terme"
+msgstr "Votez contre ce terme"
+
+#: templates/jocondelab/partial/contributed_item.html:9
+msgid "Annulez votre contribution"
+msgstr "Annulez votre contribution"
+
#: templates/jocondelab/partial/filter.html:3
msgid "Select term"
msgstr "Choisir terme"
@@ -319,13 +548,48 @@
msgid "previous"
msgstr "préc."
-#: templates/jocondelab/partial/wrapped_notice_list.html:3
-msgid "results for:"
-msgstr "résultats pour :"
+#: templates/jocondelab/partial/termlist_contents.html:5
+msgid "Termes les plus fréquents"
+msgstr "Termes les plus fréquents"
+
+#: templates/jocondelab/partial/termlist_contents.html:15
+msgid "Classer par ordre alphabétique"
+msgstr "Classer par ordre alphabétique"
-#: templates/jocondelab/partial/wrapped_notice_list.html:3
-msgid "results"
-msgstr "résultats"
+#: templates/jocondelab/partial/wrapped_notice_list.html:7
+#, python-format
+msgid ""
+"\n"
+" <b>%(count)s</b> résultat pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+msgid_plural ""
+"\n"
+" <b>%(count)s</b> résultats pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+msgstr[0] ""
+"\n"
+" <b>%(count)s</b> résultat pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+msgstr[1] ""
+"\n"
+" <b>%(count)s</b> résultats pour <b>« "
+"%(searchterms_label)s »</b>\n"
+" "
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:13
+#, python-format
+msgid ""
+"Aucun résultat pour <b>« %(searchterms_label)s »</b>"
+msgstr ""
+"Aucun résultat pour <b>« %(searchterms_label)s »</b>"
+
+#: templates/jocondelab/partial/wrapped_notice_list.html:16
+#, python-format
+msgid "<b>%(count)s</b> œuvres des musées de France"
+msgstr "<b>%(count)s</b> œuvres des musées de France"
#: templates/registration/login.html:6
msgid "Sorry, that's not a valid username or password."
@@ -336,79 +600,6 @@
msgid "login"
msgstr "connex."
-# Thesaurus Identifiers
-msgctxt "Thesaurus label"
-msgid "AUTR"
-msgstr "Auteur(s)"
-
-msgctxt "Thesaurus label"
-msgid "ECOL"
-msgstr "École"
-
-msgctxt "Thesaurus label"
-msgid "DOMN"
-msgstr "Domaine(s)"
-
-msgctxt "Thesaurus label"
-msgid "DENO"
-msgstr "Dénomination"
-
-msgctxt "Thesaurus label"
-msgid "APPL"
-msgstr "Appellation"
-
-msgctxt "Thesaurus label"
-msgid "TITR"
-msgstr "Titre"
-
-msgctxt "Thesaurus label"
-msgid "REPR"
-msgstr "Sujet représenté"
-
-msgctxt "Thesaurus label"
-msgid "SREP"
-msgstr "Sources de la représentation"
-
-msgctxt "Thesaurus label"
-msgid "PERI"
-msgstr "Période de création ou d'exécution"
-
-msgctxt "Thesaurus label"
-msgid "MILL"
-msgstr "Millésime de création ou d'exécution"
-
-msgctxt "Thesaurus label"
-msgid "EPOQ"
-msgstr "Époque, style, mouvement"
-
-msgctxt "Thesaurus label"
-msgid "TECH"
-msgstr "Matériaux, techniques"
-
-msgctxt "Thesaurus label"
-msgid "DIMS"
-msgstr "Mesures"
-
-msgctxt "Thesaurus label"
-msgid "LIEUX"
-msgstr "Lieu"
-
-msgctxt "Thesaurus label"
-msgid "DECV"
-msgstr "Découverte"
-
-msgctxt "Thesaurus label"
-msgid "HIST"
-msgstr "Historique"
-
-msgctxt "Thesaurus label"
-msgid "LOCA"
-msgstr "Lieu de conservation"
-
-msgctxt "Thesaurus label"
-msgid "COPY"
-msgstr "Copyright notice"
-
-msgctxt "Thesaurus label"
-msgid "PHOT"
-msgstr "Crédits photographiques"
+#: views/front_office.py:92
+msgid " ET "
+msgstr " ET "
Binary file src/jocondelab/locale/fr/LC_MESSAGES/djangojs.mo has changed
--- a/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po Wed Oct 09 18:43:09 2013 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-03 08:45-0500\n"
+"POT-Creation-Date: 2013-10-09 10:22-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,21 +18,17 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: static/jocondelab/js/front-geo.js:11
-msgid "Map data © OpenStreetMap contributors"
-msgstr "Données cartographiques © Contributeurs OpenStreetMap"
-
-#: static/jocondelab/js/front-notice.js:229
-msgid "Validating Resource…"
-msgstr "Validation de la ressource…"
+msgid "© contributeurs de OpenStreetMap"
+msgstr ""
-#: static/jocondelab/js/front-notice.js:233
-msgid "Saving contribution…"
-msgstr "Enregistrement de la contribution…"
+#: static/jocondelab/js/front-notice.js:189
+#, fuzzy
+msgid "Validation en cours…"
+msgstr "Validation en cours…"
-#: static/jocondelab/js/front-notice.js:257
-#: static/jocondelab/js/front-notice.js:261
-msgid "No DbPedia resource found for term"
-msgstr "Pas de ressource DbPédia trouvée pour le terme"
+#: static/jocondelab/js/front-notice.js:218
+msgid "Validation impossible"
+msgstr "Validation impossible"
#: static/jocondelab/js/jocondelab.js:14
msgid "Redirected from: "
@@ -65,4 +61,4 @@
#: static/jocondelab/js/jocondelab.js:361
msgid "Cancel"
-msgstr "Annuler"
+msgstr "Annuler"
\ No newline at end of file
--- a/src/jocondelab/static/jocondelab/css/front-common.css Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-common.css Wed Oct 09 18:43:09 2013 +0200
@@ -138,11 +138,28 @@
}
footer {
- padding: 60px 0 20px; text-align: right; font-size: 16px;
+ padding: 60px 0 20px; text-align: right; font-size: 15px; line-height: 67px;
}
footer img {
- vertical-align: middle; margin: 0 10px;
+ vertical-align: middle; height: 67px;
+}
+
+.footer-links {
+ float: left; font-size: 15px; line-height: 67px;
+}
+
+.footer-links li {
+ display: inline-block;
+}
+
+.footer-links li:after {
+ content: "•";
+ margin: 0 5px;
+}
+
+.footer-links li:last-child:after {
+ display: none;
}
input {
@@ -440,6 +457,10 @@
display: none; margin: 20px 0 10px; text-align: center; font-size: 14px; font-weight: 700;
}
+.notice-years {
+ display: inline-block;
+}
+
.notice-year {
font-weight: bold;
}
@@ -447,15 +468,15 @@
/* Wikipedia Box in search results */
.wiki-info {
- float: left; width: 480px; height: 320px; background: url("../img/background-pinstripe-blue.png");
+ float: left; width: 480px; height: 320px; background: url("../img/background-pinstripe-blue.png"); overflow: hidden;
}
.wiki-info p {
- font-size: 13px;
+ font-size: 13px; text-align: justify;
}
.wiki-info-title {
- font-size: 16px; font-weight: 700; margin: 10px;
+ font-size: 16px; font-weight: 700; margin: 10px 10px 0;
}
.wiki-info-abstract {
@@ -463,7 +484,7 @@
}
.wiki-info-source {
- color: #0063DC; font-size: 10px; margin: 10px;
+ color: #0063DC; font-size: 10px; margin: 5px 10px;
}
.wiki-info-image {
@@ -474,6 +495,12 @@
float: right;
}
+/* About pages */
+
+.about-text {
+ font-size: 13px; margin: 5px 0;
+}
+
/* Smaller screens adaptation */
@media screen and (max-width: 720px) {
@@ -496,7 +523,7 @@
}
.wiki-info p {
- font-size: 12px;
+ font-size: 12px; text-align: left;
}
}
--- a/src/jocondelab/static/jocondelab/css/front-notice.css Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-notice.css Wed Oct 09 18:43:09 2013 +0200
@@ -22,6 +22,10 @@
float: right; clear: right; width: 20%;
}
+.describe-mode .notice-images li:nth-child(2n+2) {
+ clear: right;
+}
+
.describe-mode .notice-images img {
max-height: 480px;
}
--- a/src/jocondelab/static/jocondelab/css/front-timeline.css Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-timeline.css Wed Oct 09 18:43:09 2013 +0200
@@ -1,13 +1,23 @@
.timeline-section-title {
- font-size: 16px; font-weight: bold; margin: 5px 0 10px;
+ font-size: 16px; font-weight: bold; margin: 10px 0 0; padding: 5px 10px; background: #ffffff;
+ border-width: 1px; border-color: #cccccc; border-style: solid solid none;
+ border-radius: 10px 10px 0 0; display: inline-block;
+}
+
+.timeline-section {
+ background: #ffffff;
+ background: linear-gradient(to bottom, #ffffff 0%, #f0f0f0 100%);
+ background: -webkit-linear-gradient(to bottom, #ffffff 0%, #f0f0f0 100%);
+ background: -moz-linear-gradient(to bottom, #ffffff 0%, #f0f0f0 100%);
+ border: 1px solid #cccccc; border-radius: 0 10px 10px 10px; padding: 15px 30px 15px 20px;
}
.timeline-wrapper {
- position: relative; width: 100%; height: 420px; margin-top: 10px;
+ position: relative; height: 420px;
}
.timeline-container {
- position: absolute; left: 0; top: 0; bottom: 0; right: 30px; overflow: hidden;
+ position: absolute; left: 0; top: 0; bottom: 0; right: 0; overflow: hidden;
}
.timeline-canvas {
@@ -19,7 +29,7 @@
}
.timeline-slider-container {
- position: absolute; right: 0; width: 30px; top: 60px; bottom: 0;
+ position: absolute; right: -30px; width: 30px; top: 60px; bottom: 0;
}
.timeline-zoom-button {
@@ -57,15 +67,19 @@
}
.timeline-mill-slider {
- font-size: 16px; margin-bottom: 10px; margin-right: 30px;
+ font-size: 16px; margin-bottom: 10px;
}
.timeline-mill-slider .ui-slider-range {
background: #ffcc99;
}
+.timeline-mill-p {
+ text-align: right;
+}
+
.timeline-mill-submit {
- float: right; padding: 5px 10px; line-height: 20px; font-size: 14px; margin-right: 30px;
+ padding: 5px 10px; line-height: 20px; font-size: 14px;
}
.timeline-mill-submit span {
@@ -73,7 +87,7 @@
}
.timeline-arrows {
- margin-right: 30px; height: 30px; clear:both; text-align: center; background: #ffffff; font-size: 16px; line-height: 30px;
+ height: 30px; clear:both; text-align: center; background: #ffffff; font-size: 16px; line-height: 30px;
}
.timeline-arrows a {
--- a/src/jocondelab/static/jocondelab/js/front-common.js Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/front-common.js Wed Oct 09 18:43:09 2013 +0200
@@ -25,11 +25,23 @@
var $searchInput = $(".search-input"),
originalValue = $searchInput.val(),
- allowSubmit = false;
+ allowSubmit = false,
+ uri_cache = window.uri_cache || {};
function submitIfChanged(e, ui) {
var val = $searchInput.val();
if (allowSubmit && val && val !== originalValue) {
+ var labels_to_look = val.split(";"),
+ dbpedia_uris = [];
+ _(labels_to_look).each(function(lbl) {
+ var uri = uri_cache[lbl.toLowerCase()];
+ if (uri) {
+ dbpedia_uris.push(uri);
+ }
+ });
+ if (dbpedia_uris.length === labels_to_look.length) {
+ $searchInput.val(dbpedia_uris.join(";")).attr("name", "dbpedia_uri");
+ }
$(".search-form").submit();
}
}
@@ -40,6 +52,11 @@
focus: function(e, ui) {
showDbpediaBox(ui.item.dbpedia_uri);
setDbpediaBoxAnchor({type: "dom", selector: $(e.target).autocomplete("widget"), positioning: "side"});
+ },
+ response: function(e, ui) {
+ _(ui.content).each(function(c) {
+ uri_cache[c.label.toLowerCase()] = c.dbpedia_uri;
+ });
}
},
allowSpaces: true,
--- a/src/jocondelab/static/jocondelab/js/front-geo.js Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/front-geo.js Wed Oct 09 18:43:09 2013 +0200
@@ -8,7 +8,7 @@
L.tileLayer(
"http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
{
- attribution: gettext("Map data © OpenStreetMap contributors")
+ attribution: gettext("© contributeurs de OpenStreetMap")
}
).addTo(map);
--- a/src/jocondelab/static/jocondelab/js/front-notice.js Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/front-notice.js Wed Oct 09 18:43:09 2013 +0200
@@ -186,7 +186,7 @@
$(".contribution-frame").submit(function() {
var val = $ncf.val(),
dbpedia_uri = dbpCache[val] ? dbpCache[val].dbpedia_uri : undefined,
- $tmpItem = $(tmpTemplate).text(gettext("Validating Resource…"));
+ $tmpItem = $(tmpTemplate).text(gettext("Validation en cours…"));
console.log("Submitting", val);
$ncf.val("");
$ntl.append($tmpItem);
@@ -215,7 +215,7 @@
},
error: function() {
$tmpItem.remove();
- alert("Couldn't validate term");
+ alert(gettext("Validation impossible"));
}
});
return false;
--- a/src/jocondelab/templates/jocondelab/front_about.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_about.html Wed Oct 09 18:43:09 2013 +0200
@@ -6,7 +6,7 @@
{% block breadcrumbs %}<a href="{% url 'front_about' %}">{% trans 'À propos' %}</a>{% endblock %}
{% block main %}
-
- <h2>{% trans 'À propos de JocondeLab' %}</h2>
+
+ <p class="about-text">{% blocktrans %}À propos de JocondeLab, texte à définir{% endblocktrans %}</p>
{% endblock %}
\ No newline at end of file
--- a/src/jocondelab/templates/jocondelab/front_base.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_base.html Wed Oct 09 18:43:09 2013 +0200
@@ -60,7 +60,7 @@
<td>
{% block header_search %}
<form class="header-search-form search-form" action="{% url 'front_search' %}">
- <input class="header-search-input search-input" type="search" name="q" placeholder="{% trans 'Search in contents' %}" />
+ <input class="header-search-input search-input" type="search" name="q" placeholder="{% trans 'Rechercher' %}" />
</form>
{% endblock %}
</td>
@@ -120,13 +120,21 @@
</section>
<footer>
{% block footer %}
- <p>Ce site vous est proposé par
- <a href="http://www.culture.gouv.fr/" title="Ministère de la Culture et de la Communication" target="_blank">
- <img src="{{STATIC_URL}}jocondelab/img/logo_mcc_footer.png" alt="Logo du Ministère de la Culture et de la Communication" />
+ <ul class="footer-links">
+ <li>
+ <a href="{% url 'front_legal' %}">{% trans "Mentions légales" %}</a>
+ </li>
+ <li>
+ <a href="{% url 'front_credits' %}">{% trans "Crédits" %}</a>
+ </li>
+ </ul>
+ <p>{% trans 'Ce site vous est proposé par' %}
+ <a href="http://www.culture.gouv.fr/" title="{% trans "Ministère de la Culture et de la Communication" %}" target="_blank">
+ <img src="{{STATIC_URL}}jocondelab/img/logo_mcc_footer.png" alt="{% trans "Logo du Ministère de la Culture et de la Communication" %}" />
</a>
- et
- <a href="http://www.iri.centrepompidou.fr/" title="Institut de Recherche et d'Innovation" target="_blank">
- <img src="{{STATIC_URL}}jocondelab/img/logo_IRI_footer.png" alt="Logo de l'Institut de Recherche et d'Innovation" />
+ {% trans 'et' %}
+ <a href="http://www.iri.centrepompidou.fr/" title="{% trans "Institut de Recherche et d'Innovation" %}" target="_blank">
+ <img src="{{STATIC_URL}}jocondelab/img/logo_IRI_footer.png" alt="{% trans "Logo de l'Institut de Recherche et d'Innovation" %}" />
</a>
</p>
{% endblock %}
@@ -137,7 +145,7 @@
<img class="dbpedia-image" />
<h2 class="dbpedia-title"></h2>
<p class="dbpedia-abstract"></p>
- <p class="dbpedia-source"><a href="#" target="_blank">{% trans 'Source: Wikipedia' %}</a></p>
+ <p class="dbpedia-source"><a href="#" target="_blank">{% trans 'Source : Wikipédia' %}</a></p>
</div>
{% endblock %}
<script>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/templates/jocondelab/front_credits.html Wed Oct 09 18:43:09 2013 +0200
@@ -0,0 +1,12 @@
+{% extends "jocondelab/front_base.html" %}
+{% load i18n %}
+
+{% block title %}JocondeLab » {% trans 'Crédits' %}{% endblock %}
+
+{% block breadcrumbs %}<a href="{% url 'front_about' %}">{% trans 'Crédits' %}</a>{% endblock %}
+
+{% block main %}
+
+ <p class="about-text">{% blocktrans %}Crédits de JocondeLab{% endblocktrans %}</p>
+
+{% endblock %}
\ No newline at end of file
--- a/src/jocondelab/templates/jocondelab/front_describe.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_describe.html Wed Oct 09 18:43:09 2013 +0200
@@ -12,7 +12,7 @@
<form class="contribution-frame description-frame">
<h2>{% trans "Décrivez le sujet de cette œuvre" %}</h2>
<p>Les termes proposés proviennent de Wikipédia.</p>
- <input class="notice-contribution-field" data-thesaurus-label="REPR" type="text" size="60" placeholder="{% trans 'Que voyez-vous dans cette oeuvre ?' %}" />
+ <input class="notice-contribution-field" data-thesaurus-label="REPR" type="text" size="60" />
<ul class="notice-term-list notice-contribution-list contribution-novote"></ul>
<p class="button-links">
{% if prev_notice %}<a href="{% url 'front_describe' prev_notice %}">{% trans 'Œuvre précédente' %}</a>{% endif %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/templates/jocondelab/front_legal.html Wed Oct 09 18:43:09 2013 +0200
@@ -0,0 +1,12 @@
+{% extends "jocondelab/front_base.html" %}
+{% load i18n %}
+
+{% block title %}JocondeLab » {% trans 'Mentions légales' %}{% endblock %}
+
+{% block breadcrumbs %}<a href="{% url 'front_about' %}">{% trans 'Mentions légales' %}</a>{% endblock %}
+
+{% block main %}
+
+ <p class="about-text">{% blocktrans %}Mentions légales de JocondeLab{% endblocktrans %}</p>
+
+{% endblock %}
\ No newline at end of file
--- a/src/jocondelab/templates/jocondelab/front_notice.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_notice.html Wed Oct 09 18:43:09 2013 +0200
@@ -141,7 +141,7 @@
{% block contribution %}
<form class="contribution-frame folksonomy-frame">
<h2>{% trans "Ajoutez vos mots-clés" %}</h2>
- <p>Les termes proposés proviennent de Wikipédia.</p>
+ <p>{% trans "Les termes proposés proviennent de Wikipédia." %}</p>
<input class="notice-contribution-field" type="text" size="60" />
<ul class="notice-term-list notice-contribution-list">
{% for term in contributions %}
--- a/src/jocondelab/templates/jocondelab/front_search.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_search.html Wed Oct 09 18:43:09 2013 +0200
@@ -4,21 +4,26 @@
{% block js_declaration %}
{{block.super}}
<script type="text/javascript">
- var queryobj = {% if queryobj %}{{queryobj|safe}}{% else %}null{% endif %};
+ var queryobj = {% if queryobj %}{{queryobj|safe}}{% else %}null{% endif %},
+ uri_cache = {% if uri_cache %}{{uri_cache|safe}}{% else %}{}{% endif %};
</script>
<script type="text/javascript" src="{{STATIC_URL}}jocondelab/js/front-search.js"></script>
{% endblock %}
-{% block title %}JocondeLab » {% if searchterm %}{% trans 'Résultats pour : « ' %}{{searchterm}}{% trans ' »' %}{% else %}{% trans 'Recherche' %}{% endif %}{% endblock %}
+{% block title %}JocondeLab » {% if searchterms_label %}{% blocktrans %}Résultats pour : « {{searchterms_label}} »{% endblocktrans %}{% else %}{% trans 'Recherche' %}{% endif %}{% endblock %}
-{% block breadcrumbs %}<a href="{% url 'front_search' %}{% if searchterm %}?q={{searchterm|urlencode}}{% endif %}">{% if searchterm %}{% trans 'Résultats pour : « ' %}{{searchterm}}{% trans ' »' %}{% else %}{% trans 'Recherche' %}{% endif %}</a>{% endblock %}
+{% block breadcrumbs %}
+ <a href="{% url 'front_search' %}{% if querystr %}?{{querystr}}{% endif %}">
+ {% if searchterms_label %}{% blocktrans %}Résultats pour : « {{searchterms_label}} »{% endblocktrans %}{% else %}{% trans 'Recherche' %}{% endif %}
+ </a>
+{% endblock %}
{% block header_search %}{% endblock %}
{% block main %}
<form class="big-search-form search-form" action="{% url 'front_search' %}">
- <input class="big-search-input search-input" type="search" name="q" value="{{searchterm}}" />
+ <input class="big-search-input search-input" type="search" name="q" value="{{searchterms_input}}" placeholder="{% trans 'Rechercher' %}" />
</form>
<div class="results">{% include 'jocondelab/partial/wrapped_notice_list.html' %}</div>
--- a/src/jocondelab/templates/jocondelab/front_timeline.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_timeline.html Wed Oct 09 18:43:09 2013 +0200
@@ -25,8 +25,8 @@
{% block breadcrumbs %}<a href="{% url 'front_timeline' %}">{% trans 'Chronologie' %}</a>{% endblock %}
{% block main %}
-
<h2 class="timeline-section-title">{% trans 'Recherche par période' %}</h2>
+ <div class="timeline-section">
<div class="timeline-wrapper">
<div class="timeline-container">
<canvas class="timeline-canvas"></canvas>
@@ -42,17 +42,20 @@
<span class="timeline-span-from">0</span>
—
<span class="timeline-span-to">0</span>
- <a class="timeline-goleft" href="#" data-direction="-1">←</a>
- <a class="timeline-goright" href="#" data-direction="+1">→</a>
+ <a class="timeline-goleft" href="#" data-direction="{% if not current_lang.bidi %}-{% endif %}1">←</a>
+ <a class="timeline-goright" href="#" data-direction="{% if current_lang.bidi %}-{% endif %}1">→</a>
+ </div>
</div>
<h2 class="timeline-section-title">{% trans 'Recherche par date' %}</h2>
+ <div class="timeline-section">
<div class="timeline-mill-slider"></div>
- <button class="timeline-mill-submit">
+ <p class="timeline-mill-p"><button class="timeline-mill-submit">
{% trans 'Afficher les contenus de ' %}
<span class="timeline-mill-from-year">0</span>
{% trans ' à ' %}
<span class="timeline-mill-to-year">0</span>
- </button>
+ </button></p>
+ </div>
<div class="results"></div>
--- a/src/jocondelab/templates/jocondelab/partial/notice_list.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/partial/notice_list.html Wed Oct 09 18:43:09 2013 +0200
@@ -7,30 +7,93 @@
<img class="notice-image" alt="{{notice.imagetitle}}" src="{{notice.image}}" onerror="window.onResultImageError(this);" />
</a>
<div class="notice-metadata">
- {% if notice.title %}<h2><a href="{% url 'front_notice' notice.id %}">{% trans 'TITR' context 'Thesaurus label' %}{% trans ':' %} <span class="notice-title" dir="ltr">{{notice.title}}</span></a></h2>{% endif %}
- {% if not notice.title and notice.denomination %}<h2><a href="{% url 'front_notice' notice.id %}">{% trans 'DENO' context 'Thesaurus label' %}{% trans ':' %} <span class="notice-title" dir="ltr">{{notice.denomination}}</span></a></h2>{% endif %}
+ {% if notice.title %}
+ <h2>
+ <a href="{% url 'front_notice' notice.id %}">{% trans 'Titre :' %} <span class="notice-title" dir="ltr">{{notice.title}}</span></a></h2>
+ </h2>
+ {% elif notice.designation %}
+ <h2>
+ <a href="{% url 'front_notice' notice.id %}">{% trans 'Désignation :' %} <span class="notice-title" dir="ltr">{{notice.designation}}</span></a>
+ </h2>
+ {% endif %}
<ul>
- {% if not notice.terms_by_thesaurus.AUTR and notice.author %}
+ {% if notice.terms_by_thesaurus.AUTR %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'Artiste(s) :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.terms_by_thesaurus.AUTR %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% elif notice.author %}
<li class="notice-thesaurus">
- <h3 class="notice-thesaurus-title">{% trans 'AUTR' context 'Thesaurus label' %}{% trans ':' %}</h3>
+ <h3 class="notice-thesaurus-title">{% trans 'Artiste(s) :' %}</h3>
<p class="notice-terms-list" dir="ltr">{{notice.author}}</p>
</li>
{% endif %}
- {% for thesaurus, terms in notice.terms_by_thesaurus.items %}
+ {% if notice.terms_by_thesaurus.ECOL %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'École :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.terms_by_thesaurus.ECOL %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if notice.terms_by_thesaurus.DOMN %}
<li class="notice-thesaurus">
- <h3>{% trans thesaurus context 'Thesaurus label' %}{% trans ':' %}</h3>
+ <h3>{% trans 'Domaine(s) :' %}</h3>
<ul class="notice-term-list">
- {% for term in terms %}
- <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.locale_label}}</a></li>
+ {% for term in notice.terms_by_thesaurus.DOMN %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if notice.terms_by_thesaurus.REPR %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'Sujet représenté :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.terms_by_thesaurus.REPR %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
{% endfor %}
</ul>
</li>
- {% endfor %}
- {% if notice.years %}
- <li class="notice-thesaurus">
- <h3 class="notice-thesaurus-title">{% trans 'MILL' context 'Thesaurus label' %}{% trans ':' %}</h3>
- <p class="notice-terms-list"><span class="notice-year">{{notice.years.0}}</span>{% if notice.years.0 != notice.years.1 %} – <span class="notice-year">{{notice.years.1}}</span>{% endif %}</p>
- </li>
+ {% endif %}
+ {% if notice.terms_by_thesaurus.SREP %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'Source :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.terms_by_thesaurus.SREP %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% endif %}
+ {% if notice.datation or notice.years %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'Datation :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.datation %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ {% if notice.years %}
+ {% endif %}
+ <li class="notice-years"><span class="notice-year">{{notice.years.0}}</span>{% if notice.years.0 != notice.years.1 %} – <span class="notice-year">{{notice.years.1}}</span>{% endif %}</li>
+ </ul>
+ </li>
+ {% endif %}
+ {% if notice.terms_by_thesaurus.LIEUX %}
+ <li class="notice-thesaurus">
+ <h3>{% trans 'Provenance :' %}</h3>
+ <ul class="notice-term-list">
+ {% for term in notice.terms_by_thesaurus.LIEUX %}
+ <li class="notice-term"><a href="{% url 'front_search' %}?dbpedia_uri={{term.dbpedia_uri|urlencode}}" data-dbpedia-uri="{{term.dbpedia_uri}}">{{term.label}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
{% endif %}
</ul>
</div>
--- a/src/jocondelab/templates/jocondelab/partial/wrapped_notice_list.html Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/partial/wrapped_notice_list.html Wed Oct 09 18:43:09 2013 +0200
@@ -1,7 +1,21 @@
{% load i18n %}
{% load jlutils %}
-<h2 class="resultcount"><b>{{count}}</b> {% if searchterm %}{% trans 'résultats pour :' %} <b>{{searchterm}}</b>{% else %}{% trans 'œuvres des musées de France' %}{% endif %}</h2>
+<h2 class="resultcount">
+{% if searchterms_label %}
+ {% if count %}
+ {% blocktrans count counter=count %}
+ <b>{{count}}</b> résultat pour <b>« {{searchterms_label}} »</b>
+ {% plural %}
+ <b>{{count}}</b> résultats pour <b>« {{searchterms_label}} »</b>
+ {% endblocktrans %}
+ {% else %}
+ {% blocktrans %}Aucun résultat pour <b>« {{searchterms_label}} »</b>{% endblocktrans %}
+ {% endif %}
+{% else %}
+ {% blocktrans %}<b>{{count}}</b> œuvres des musées de France{% endblocktrans %}
+{% endif %}
+</h2>
<ul class="notice-list clearfix"{% if page_count %} data-page-count="{{page_count}}"{% endif %} data-current-page="{{current_page}}">
{% if wkinfo %}
@@ -15,7 +29,7 @@
<a href="{{wkinfo.label|wikiurl:lang}}" target="_blank">{{wkinfo.label}}</a>
</h3>
<p class="wiki-info-source">
- <a href="{{wkinfo.label|wikiurl:lang}}" target="_blank">{% trans 'Source : Wikipédia' %}</a>
+ <a href="{{wkinfo.label|wikiurl:lang}}" target="_blank">{% trans 'Source : Wikipédia' %}</a>
</p>
<p class="wiki-info-abstract">{{wkinfo.abstract|default_if_none:""}}</p>
</li>
--- a/src/jocondelab/urls.py Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/urls.py Wed Oct 09 18:43:09 2013 +0200
@@ -38,6 +38,8 @@
url(r'^map/$', GeoView.as_view(), name='front_geo'),
url(r'^timeline/$', TemplateView.as_view(template_name="jocondelab/front_timeline.html"), name='front_timeline'),
url(r'^about/$', TemplateView.as_view(template_name="jocondelab/front_about.html"), name='front_about'),
+ url(r'^credits/$', TemplateView.as_view(template_name="jocondelab/front_credits.html"), name='front_credits'),
+ url(r'^legal/$', TemplateView.as_view(template_name="jocondelab/front_legal.html"), name='front_legal'),
url(r'^notice/(?P<pk>\d+)/$', NoticeView.as_view(), name='front_notice'),
url(r'^describe/(?P<pk>\d+)/$', NoticeView.as_view(template_name="jocondelab/front_describe.html", show_contributions=False), name='front_describe'),
url(r'^describe/$', 'jocondelab.views.front_office.describe_view', name='random_describe'),
--- a/src/jocondelab/views/front_office.py Wed Oct 09 11:53:16 2013 +0200
+++ b/src/jocondelab/views/front_office.py Wed Oct 09 18:43:09 2013 +0200
@@ -14,6 +14,8 @@
from django.db.models import Sum, Count
import random
from django.shortcuts import redirect
+from django.utils.translation import ugettext
+from django.utils.http import urlencode
class SearchView(TemplateView):
@@ -30,7 +32,8 @@
querystr = request.GET.get('q', "")
is_ajax = request.is_ajax()
queryterms = [s.strip(" ") for s in querystr.split(";") if s.strip(" ")]
- dbpedia_uri = request.GET.get('dbpedia_uri', None)
+ dbpedia_uri = request.GET.get('dbpedia_uri', "")
+ dbpedia_uris = [s.strip(" ") for s in dbpedia_uri.split(";") if s.strip(" ")]
from_year = request.GET.get('from_year', None)
to_year = request.GET.get('to_year', from_year)
show_years = request.GET.get('show_years',False)
@@ -54,31 +57,41 @@
context["count"] = qs.count()
ns = qs.order_by('?')[:npp]
else:
- if dbpedia_uri:
- qs = qs.filter(noticeterm__term__dbpedia_uri=dbpedia_uri)
- context["queryobj"] = json.dumps({'dbpedia_uri': dbpedia_uri})
- if page == 1:
- termobj = Term.objects.filter(dbpedia_uri=dbpedia_uri)[0]
- if termobj:
- termtrans = termobj.dbpedia_fields.filter(language_code = lang)
- if termtrans.exists():
- context["wkinfo"] = termtrans[0]
- context["searchterm"] = termtrans[0].label
- else:
- context["searchterm"] = termobj.label
- if queryterms:
- context["searchterm"] = querystr
- context["queryobj"] = json.dumps({'q': querystr})
+ uri_cache = {}
+ if dbpedia_uris:
+ queryobj = {'dbpedia_uri': dbpedia_uri}
+ searchterms = []
+ for i, uri in enumerate(dbpedia_uris):
+ fs = DbpediaFields.objects.filter(dbpedia_uri=uri, language_code=lang)
+ if fs.exists():
+ firstres = fs[0]
+ searchterms.append(firstres.label)
+ uri_cache[firstres.label.lower()] = firstres.dbpedia_uri
+ if i == 0 and page == 1 and len(dbpedia_uris) == 1:
+ context["wkinfo"] = firstres
+ fs = fs.values('term_id').distinct()
+ qs = qs.filter(noticeterm__term__in=fs)
+ elif queryterms:
+ searchterms = queryterms
+ queryobj = {'q': querystr}
for i, term in enumerate(queryterms):
fs = DbpediaFields.objects.filter(label=term, language_code=lang)
- if i == 0 and page == 1 and len(queryterms) == 1 and fs.exists():
- context["wkinfo"] = fs[0]
+ if fs.exists():
+ firstres = fs[0]
+ uri_cache[firstres.label.lower()] = firstres.dbpedia_uri
+ if i == 0 and page == 1 and len(queryterms) == 1:
+ context["wkinfo"] = firstres
fs = fs.values('term_id').distinct()
qs = qs.filter(noticeterm__term__in=fs)
- if from_year:
- context["queryobj"] = json.dumps({'from_year': from_year, 'to_year': to_year})
- context["searchterm"] = u"%s – %s"%(from_year, to_year)
+ elif from_year:
+ queryobj = {'from_year': from_year, 'to_year': to_year}
+ searchterms = [u"%s – %s"%(from_year, to_year)]
qs = qs.filter(years__start_year__lte=to_year, years__end_year__gte=from_year)
+ context["queryobj"] = json.dumps(queryobj)
+ context["querystr"] = urlencode(queryobj)
+ context["searchterms_label"] = ugettext(u" ET ").join(searchterms)
+ context["searchterms_input"] = u";".join(searchterms)
+ context["uri_cache"] = json.dumps(uri_cache)
qs = qs.order_by('id').distinct()
paginator = Paginator(qs, npp)
context["count"] = paginator.count
@@ -89,23 +102,25 @@
thesauruscache = {th.id: th.label for th in Thesaurus.objects.all()}
for n in ns:
terms = [{
- "locale_label": t.dbpedia_fields.get(language_code=lang).label,
+ "label": t.dbpedia_fields.get(language_code=lang).label,
"thesaurus": thesauruscache[t.thesaurus_id],
"dbpedia_uri": t.dbpedia_uri
- } for t in Term.objects.filter(noticeterm__notice=n,dbpedia_fields__language_code=lang).distinct()]
+ } for t in Term.objects.filter(noticeterm__notice=n,dbpedia_fields__language_code=lang).order_by('dbpedia_fields__label').distinct()]
termsbythesaurus = {}
for term in terms:
- th = termsbythesaurus.setdefault(term["thesaurus"], [])
- th.append(term)
+ if term['label'] is not None:
+ th = termsbythesaurus.setdefault(term["thesaurus"], [])
+ th.append(term)
noticedict = {
"id": n.id,
- "imagetitle": n.titr if n.titr else n.deno,
"title": n.titr,
- "denomination": n.deno,
+ "designation": " | ".join([ v for v in [ n.deno, n.appl] if v ]),
"image": (settings.JOCONDE_IMG_BASE_URL + n.images.all()[0].url) if n.images.exists() else "",
"author": n.autr,
"terms_by_thesaurus": termsbythesaurus,
+ "datation": termsbythesaurus.get("PERI",[]) + termsbythesaurus.get("EPOQ",[])
}
+ noticedict['image_title'] = noticedict['title'] if noticedict['title'] else noticedict['designation']
if show_years and n.years.exists():
noticedict["years"] = [n.years.all()[0].start_year, n.years.all()[0].end_year]
notices.append(noticedict)
@@ -182,7 +197,6 @@
context['next_notice'] = notice_history[p + 1]
if p > 0:
context['prev_notice'] = notice_history[p - 1]
- context['done_notices'] = len(notice_history)
return context