Binary file src/egonomy/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/egonomy/locale/en/LC_MESSAGES/django.po Fri Jun 28 15:47:00 2013 +0200
+++ b/src/egonomy/locale/en/LC_MESSAGES/django.po Fri Jun 28 16:14:01 2013 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-05 03:24-0600\n"
+"POT-Creation-Date: 2013-06-28 08:44-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,252 +17,381 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: settings.py:138
+#: settings.py:149
msgid "French"
msgstr ""
-#: settings.py:139
+#: settings.py:150
msgid "English"
msgstr ""
-#: views.py:72 views.py:96
+#: views.py:84 views.py:108
msgid "You are not allowed to modify this fragment."
msgstr ""
+#: views.py:238
+msgid "You are not allowed to delete this fragment."
+msgstr ""
+
+#: templates/egonomy_all_collections.html:7
+msgid "All collection"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:20
+#: templates/egonomy_all_collections.html:50
+msgid "New collection"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:26
+msgid "Title"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:30
+#: templates/egonomy_annotate_picture.html:71
+msgid "Description"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:34 templates/egonomy_newbase.html:48
+msgid "Cancel"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:35 templates/egonomy_newbase.html:49
+msgid "Submit"
+msgstr ""
+
+#: templates/egonomy_all_collections.html:45
+#, python-format
+msgid "My collection"
+msgid_plural "My %(counter)s collections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/egonomy_all_collections.html:47
+msgid "All collections"
+msgstr ""
+
#: templates/egonomy_all_fragments.html:7
-#: templates/egonomy_all_fragments.html:18
-#: templates/egonomy_all_fragments.html:21
-#: templates/egonomy_all_fragments.html:23 templates/egonomy_home.html:48
+#: templates/egonomy_all_fragments.html:29
+#: templates/egonomy_all_fragments.html:34 templates/egonomy_home.html:33
msgid "All fragments"
msgstr ""
-#: templates/egonomy_all_fragments.html:14
-#: templates/egonomy_all_pictures.html:14
+#: templates/egonomy_all_fragments.html:22
+#: templates/egonomy_all_pictures.html:22
msgid "No results for"
msgstr ""
-#: templates/egonomy_all_fragments.html:16
-#: templates/egonomy_all_pictures.html:16
+#: templates/egonomy_all_fragments.html:24
+#: templates/egonomy_all_pictures.html:24
msgid "Search results for"
msgstr ""
-#: templates/egonomy_all_fragments.html:20
+#: templates/egonomy_all_fragments.html:27
msgid "Fragments created by"
msgstr ""
-#: templates/egonomy_all_fragments.html:40
-#: templates/egonomy_annotate_picture.html:102
-#: templates/egonomy_create_fragment.html:220 templates/egonomy_home.html:62
-#: templates/egonomy_view_fragment.html:107
-msgid "Annotated by"
-msgstr ""
-
#: templates/egonomy_all_pictures.html:7
-#: templates/egonomy_all_pictures.html:18
-#: templates/egonomy_all_pictures.html:20 templates/egonomy_home.html:13
+#: templates/egonomy_all_pictures.html:27
+#: templates/egonomy_all_pictures.html:32 templates/egonomy_home.html:20
msgid "All pictures"
msgstr ""
-#: templates/egonomy_all_pictures.html:48
-#: templates/egonomy_annotate_picture.html:12
-#: templates/egonomy_create_fragment.html:154 templates/egonomy_home.html:39
-#: templates/egonomy_home.html.py:61 templates/egonomy_view_fragment.html:38
+#: templates/egonomy_annotate_picture.html:6
+msgid "Annotate a picture"
+msgstr ""
+
+#: templates/egonomy_annotate_picture.html:10
+#: templates/egonomy_create_fragment.html:14
+#: templates/egonomy_create_fragment.html:81
+#: templates/egonomy_embed_slideshow.html:70
+#: templates/egonomy_view_fragment.html:88
+#: templates/partial/collection_in_list.html:20
+#: templates/partial/fragment_in_list.html:15
+#: templates/partial/image_in_list.html:28
msgid "No title"
msgstr ""
-#: templates/egonomy_all_pictures.html:49
-#: templates/egonomy_annotate_picture.html:39 templates/egonomy_home.html:40
+#: templates/egonomy_annotate_picture.html:19
+#: templates/egonomy_view_fragment.html:30
+#: templates/partial/fragment_in_list.html:27
+#: templates/partial/image_in_list.html:41
+#: templates/partial/item_in_collection_list.html:26
+#: templates/partial/item_in_collection_list.html:82
+#: templates/partial/item_in_collection_mosaic.html:31
+#: templates/partial/item_in_collection_mosaic.html:71
+msgid "Create a fragment"
+msgstr ""
+
+#: templates/egonomy_annotate_picture.html:23
+#: templates/egonomy_annotate_picture.html:25
+#: templates/egonomy_view_fragment.html:34
+#: templates/egonomy_view_fragment.html:36
+#: templates/partial/fragment_in_list.html:23
+#: templates/partial/image_in_list.html:37
+#: templates/partial/item_in_collection_list.html:22
+#: templates/partial/item_in_collection_list.html:24
+#: templates/partial/item_in_collection_list.html:78
+#: templates/partial/item_in_collection_list.html:80
+#: templates/partial/item_in_collection_mosaic.html:27
+#: templates/partial/item_in_collection_mosaic.html:29
+#: templates/partial/item_in_collection_mosaic.html:67
+#: templates/partial/item_in_collection_mosaic.html:69
+msgid "Add to a collection"
+msgstr ""
+
+#: templates/egonomy_annotate_picture.html:75
+#: templates/partial/image_in_list.html:29
msgid "Author"
msgstr ""
-#: templates/egonomy_all_pictures.html:49 templates/egonomy_home.html:40
-msgid "Not documented"
-msgstr ""
-
-#: templates/egonomy_annotate_picture.html:7
-msgid "Annotate a picture"
-msgstr ""
-
-#: templates/egonomy_annotate_picture.html:35
-msgid "Description"
-msgstr ""
-
-#: templates/egonomy_annotate_picture.html:43
+#: templates/egonomy_annotate_picture.html:79
msgid "Period"
msgstr ""
-#: templates/egonomy_annotate_picture.html:47
+#: templates/egonomy_annotate_picture.html:83
msgid "Production site"
msgstr ""
-#: templates/egonomy_annotate_picture.html:51
+#: templates/egonomy_annotate_picture.html:87
msgid "Localization"
msgstr ""
-#: templates/egonomy_annotate_picture.html:55
-#: templates/egonomy_create_fragment.html:170
-msgid "RMN keywords"
+#: templates/egonomy_annotate_picture.html:94
+msgid "Keywords"
msgstr ""
-#: templates/egonomy_annotate_picture.html:63
-#: templates/egonomy_create_fragment.html:177
-msgid "Pertimm title"
-msgstr ""
-
-#: templates/egonomy_annotate_picture.html:67
-#: templates/egonomy_create_fragment.html:184
-msgid "Pertimm description"
+#: templates/egonomy_annotate_picture.html:102
+#: templates/egonomy_create_fragment.html:120
+#: templates/egonomy_view_fragment.html:151
+msgid "Fragments from this picture"
msgstr ""
-#: templates/egonomy_annotate_picture.html:71
-#: templates/egonomy_create_fragment.html:191
-msgid "Pertimm thesaurus"
+#: templates/egonomy_annotate_picture.html:114
+#: templates/egonomy_create_fragment.html:132
+#: templates/egonomy_view_fragment.html:163
+#: templates/partial/fragment_in_list.html:16
+msgid "Annotated by"
msgstr ""
-#: templates/egonomy_annotate_picture.html:76
-msgid "Save keywords"
+#: templates/egonomy_annotate_picture.html:119
+#: templates/egonomy_create_fragment.html:137
+#: templates/egonomy_view_fragment.html:168
+msgid "No fragment"
msgstr ""
-#: templates/egonomy_annotate_picture.html:79
-msgid "Last fragment created"
+#: templates/egonomy_annotate_picture.html:124
+#: templates/egonomy_create_fragment.html:142
+#: templates/egonomy_view_fragment.html:173
+msgid "No collection"
msgstr ""
-#: templates/egonomy_annotate_picture.html:80 templates/egonomy_base.html:36
-#: templates/egonomy_view_fragment.html:50
+#: templates/egonomy_base.html:36 templates/egonomy_view_fragment.html:100
+#: templates/partial/collection_in_list.html:21
msgid "by"
msgstr ""
-#: templates/egonomy_annotate_picture.html:85
-#: templates/egonomy_view_fragment.html:65
-msgid "Create a fragment"
-msgstr ""
-
-#: templates/egonomy_annotate_picture.html:91
-#: templates/egonomy_create_fragment.html:209
-#: templates/egonomy_view_fragment.html:96
-msgid "Fragments from this picture"
-msgstr ""
-
-#: templates/egonomy_base.html:38
+#: templates/egonomy_base.html:38 templates/egonomy_newbase.html:67
+#: templates/egonomy_view_collection.html:138
msgid "Search"
msgstr ""
-#: templates/egonomy_base.html:47
+#: templates/egonomy_base.html:47 templates/egonomy_newbase.html:81
msgid "Log out"
msgstr ""
-#: templates/egonomy_base.html:49
+#: templates/egonomy_base.html:49 templates/egonomy_newbase.html:83
msgid "Log in"
msgstr ""
-#: templates/egonomy_create_fragment.html:7
+#: templates/egonomy_create_fragment.html:6
msgid "Create or edit a fragment"
msgstr ""
-#: templates/egonomy_create_fragment.html:89
-msgid "Add all Senseetive keywords to yours"
+#: templates/egonomy_create_fragment.html:14
+msgid "New fragment"
msgstr ""
-#: templates/egonomy_create_fragment.html:122
+#: templates/egonomy_create_fragment.html:22
msgid "Erase the drawing"
msgstr ""
-#: templates/egonomy_create_fragment.html:123
+#: templates/egonomy_create_fragment.html:23
msgid "Back to the original drawing"
msgstr ""
-#: templates/egonomy_create_fragment.html:124
-msgid "New fragment"
-msgstr ""
-
-#: templates/egonomy_create_fragment.html:153
-#: templates/egonomy_view_fragment.html:37
+#: templates/egonomy_create_fragment.html:80
+#: templates/egonomy_view_fragment.html:87
msgid "Source picture"
msgstr ""
-#: templates/egonomy_create_fragment.html:157
-#: templates/egonomy_create_fragment.html:158
+#: templates/egonomy_create_fragment.html:84
+#: templates/egonomy_create_fragment.html:85
+#: templates/egonomy_view_fragment.html:91
msgid "Fragment's title"
msgstr ""
-#: templates/egonomy_create_fragment.html:161
-#: templates/egonomy_view_fragment.html:41
+#: templates/egonomy_create_fragment.html:88
+#: templates/egonomy_view_fragment.html:95
msgid "Fragment's description"
msgstr ""
-#: templates/egonomy_create_fragment.html:165
-#: templates/egonomy_view_fragment.html:45
-msgid "Users keywords"
-msgstr ""
-
-#: templates/egonomy_create_fragment.html:172
-msgid "Add all RMN keywords to yours"
+#: templates/egonomy_create_fragment.html:97
+#: templates/egonomy_view_fragment.html:138
+msgid "Fragment's keywords"
msgstr ""
-#: templates/egonomy_create_fragment.html:179
-msgid "Add all Pertimm title keywords to yours"
+#: templates/egonomy_create_fragment.html:101
+msgid "Source picture's keywords"
msgstr ""
-#: templates/egonomy_create_fragment.html:186
-msgid "Add all Pertimm description keywords to yours"
-msgstr ""
-
-#: templates/egonomy_create_fragment.html:193
-msgid "Add all Pertimm thesaurus keywords to yours"
-msgstr ""
-
-#: templates/egonomy_create_fragment.html:197
+#: templates/egonomy_create_fragment.html:111
msgid "Senseetive keywords"
msgstr ""
-#: templates/egonomy_create_fragment.html:198
+#: templates/egonomy_create_fragment.html:112
+#: templates/egonomy_create_fragment.html:242
msgid "Request keywords from Senseetive API"
msgstr ""
-#: templates/egonomy_create_fragment.html:202
+#: templates/egonomy_create_fragment.html:116
msgid "Save the fragment"
msgstr ""
+#: templates/egonomy_create_fragment.html:191
+msgid "Add all Senseetive keywords to yours"
+msgstr ""
+
#: templates/egonomy_home.html:6
msgid "Home"
msgstr ""
-#: templates/egonomy_home.html:12
+#: templates/egonomy_home.html:18
msgid "Last annotated pictures"
msgstr ""
-#: templates/egonomy_home.html:47
+#: templates/egonomy_home.html:31
msgid "Last created fragments"
msgstr ""
-#: templates/egonomy_home.html:61
-msgid "Fragment from"
+#: templates/egonomy_newbase.html:28
+msgid "Add to the collection"
+msgstr ""
+
+#: templates/egonomy_newbase.html:34
+msgid "Add to"
+msgstr ""
+
+#: templates/egonomy_newbase.html:44
+msgid "Image comment"
+msgstr ""
+
+#: templates/egonomy_newbase.html:79
+msgid "Hello"
+msgstr ""
+
+#: templates/egonomy_newbase.html:88
+msgid "explore"
+msgstr ""
+
+#: templates/egonomy_newbase.html:90
+msgid "collect"
msgstr ""
-#: templates/egonomy_view_fragment.html:7
+#: templates/egonomy_newbase.html:98
+msgid "my collections"
+msgstr ""
+
+#: templates/egonomy_newbase.html:100
+msgid "my fragments"
+msgstr ""
+
+#: templates/egonomy_view_collection.html:5
+msgid "View a collection"
+msgstr ""
+
+#: templates/egonomy_view_collection.html:100
+msgid "Display"
+msgstr ""
+
+#: templates/egonomy_view_collection.html:101
+msgid "Hide"
+msgstr ""
+
+#: templates/egonomy_view_collection.html:101
+msgid "the comments"
+msgstr ""
+
+#: templates/egonomy_view_collection.html:106
+msgid "Collection parameters"
+msgstr ""
+
+#: templates/egonomy_view_fragment.html:6
msgid "View a fragment"
msgstr ""
-#: templates/egonomy_view_fragment.html:49
-msgid "Last modification"
-msgstr ""
-
-#: templates/egonomy_view_fragment.html:55
+#: templates/egonomy_view_fragment.html:20
msgid "Modify this fragment"
msgstr ""
-#: templates/egonomy_view_fragment.html:60
+#: templates/egonomy_view_fragment.html:23
+#: templates/partial/fragment_in_list.html:29
+msgid ""
+"Do you really want to delete this fragment ? Warning : this action est "
+"irreversible."
+msgstr ""
+
+#: templates/egonomy_view_fragment.html:23
+#: templates/partial/fragment_in_list.html:29
+msgid "Delete this fragment"
+msgstr ""
+
+#: templates/egonomy_view_fragment.html:27
msgid "Duplicate this fragment"
msgstr ""
-#: templates/egonomy_view_fragment.html:70
+#: templates/egonomy_view_fragment.html:99
+msgid "Last modification"
+msgstr ""
+
+#: templates/egonomy_view_fragment.html:107
msgid "See the fragment in its full picture"
msgstr ""
-#: templates/egonomy_view_fragment.html:83
+#: templates/egonomy_view_fragment.html:121
msgid "See the fragment only"
msgstr ""
+#: templates/partial/fragment_in_list.html:15
+msgid "Fragment from"
+msgstr ""
+
+#: templates/partial/fragment_in_list.html:20
+#: templates/partial/image_in_list.html:34
+#: templates/partial/item_in_collection_list.html:19
+#: templates/partial/item_in_collection_list.html:75
+#: templates/partial/item_in_collection_mosaic.html:24
+#: templates/partial/item_in_collection_mosaic.html:64
+msgid "Share on Twitter"
+msgstr ""
+
+#: templates/partial/fragment_in_list.html:21
+#: templates/partial/image_in_list.html:35
+#: templates/partial/item_in_collection_list.html:20
+#: templates/partial/item_in_collection_list.html:76
+#: templates/partial/item_in_collection_mosaic.html:25
+#: templates/partial/item_in_collection_mosaic.html:65
+msgid "Share on Facebook"
+msgstr ""
+
+#: templates/partial/fragment_in_list.html:25
+#: templates/partial/image_in_list.html:39
+msgid "Log in to add to a collection"
+msgstr ""
+
+#: templates/partial/image_in_list.html:29
+msgid "Not documented"
+msgstr ""
+
#: templates/registration/login.html:5
msgid "Login"
msgstr ""
Binary file src/egonomy/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/egonomy/locale/fr/LC_MESSAGES/django.po Fri Jun 28 15:47:00 2013 +0200
+++ b/src/egonomy/locale/fr/LC_MESSAGES/django.po Fri Jun 28 16:14:01 2013 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-02 07:27-0500\n"
+"POT-Creation-Date: 2013-06-28 08:46-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"
@@ -26,270 +26,380 @@
msgid "English"
msgstr "Anglais"
-#: views.py:79
-#: views.py:103
+#: views.py:84
+#: views.py:108
msgid "You are not allowed to modify this fragment."
msgstr "Vous n'êtes pas autorisé à modifier ce fragment."
-#: views.py:230
+#: views.py:238
msgid "You are not allowed to delete this fragment."
msgstr "Vous n'êtes pas autorisé à supprimer ce fragment."
+#: templates/egonomy_all_collections.html:7
+#: templates/egonomy_all_collections.html:47
+msgid "All collections"
+msgstr "Toutes les collections"
+
+#: templates/egonomy_all_collections.html:20
+#: templates/egonomy_all_collections.html:50
+msgid "New collection"
+msgstr "Nouvelle collection"
+
+#: templates/egonomy_all_collections.html:26
+msgid "Title"
+msgstr "Titre"
+
+#: templates/egonomy_all_collections.html:30
+#: templates/egonomy_annotate_picture.html:71
+msgid "Description"
+msgstr "Description"
+
+#: templates/egonomy_all_collections.html:34
+#: templates/egonomy_newbase.html:48
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/egonomy_all_collections.html:35
+#: templates/egonomy_newbase.html:49
+msgid "Submit"
+msgstr "Envoyer"
+
+#: templates/egonomy_all_collections.html:45
+#, python-format
+msgid "My collection"
+msgid_plural "My %(counter)s collections"
+msgstr[0] "Ma collection"
+msgstr[1] "Mes %(counter)s collections"
+
#: templates/egonomy_all_fragments.html:7
-#: templates/egonomy_all_fragments.html:18
-#: templates/egonomy_all_fragments.html:21
-#: templates/egonomy_all_fragments.html:23
-#: templates/egonomy_home.html:48
+#: templates/egonomy_all_fragments.html:29
+#: templates/egonomy_all_fragments.html:34
+#: templates/egonomy_home.html:33
msgid "All fragments"
msgstr "Tous les fragments"
-#: templates/egonomy_all_fragments.html:14
-#: templates/egonomy_all_pictures.html:14
+#: templates/egonomy_all_fragments.html:22
+#: templates/egonomy_all_pictures.html:22
msgid "No results for"
msgstr "Pas de résultats pour"
-#: templates/egonomy_all_fragments.html:16
-#: templates/egonomy_all_pictures.html:16
+#: templates/egonomy_all_fragments.html:24
+#: templates/egonomy_all_pictures.html:24
msgid "Search results for"
msgstr "Résultats de recherche pour"
-#: templates/egonomy_all_fragments.html:20
+#: templates/egonomy_all_fragments.html:27
msgid "Fragments created by"
msgstr "Fragments créés par"
-#: templates/egonomy_all_fragments.html:40
-#: templates/egonomy_annotate_picture.html:102
-#: templates/egonomy_create_fragment.html:279
-#: templates/egonomy_home.html:62
-#: templates/egonomy_view_fragment.html:111
-msgid "Annotated by"
-msgstr "Annoté par"
-
-#: templates/egonomy_all_fragments.html:41
-#: templates/egonomy_view_fragment.html:59
-msgid ""
-"Do you really want to delete this fragment ? Warning : this action est "
-"irreversible."
-msgstr "Voulez-vous vraiment supprimer ce fragment ? Attention : cette action est irréversible."
-
-#: templates/egonomy_all_fragments.html:41
-#: templates/egonomy_view_fragment.html:59
-msgid "Delete this fragment"
-msgstr "Supprimer ce fragment"
-
#: templates/egonomy_all_pictures.html:7
-#: templates/egonomy_all_pictures.html:18
-#: templates/egonomy_all_pictures.html:20
-#: templates/egonomy_home.html:13
+#: templates/egonomy_all_pictures.html:27
+#: templates/egonomy_all_pictures.html:32
+#: templates/egonomy_home.html:20
msgid "All pictures"
msgstr "Toutes les images"
-#: templates/egonomy_all_pictures.html:48
-#: templates/egonomy_annotate_picture.html:12
-#: templates/egonomy_create_fragment.html:213
-#: templates/egonomy_home.html:39
-#: templates/egonomy_home.html.py:61
-#: templates/egonomy_view_fragment.html:38
+#: templates/egonomy_annotate_picture.html:6
+msgid "Annotate a picture"
+msgstr "Annoter une image"
+
+#: templates/egonomy_annotate_picture.html:10
+#: templates/egonomy_create_fragment.html:14
+#: templates/egonomy_create_fragment.html:81
+#: templates/egonomy_embed_slideshow.html:70
+#: templates/egonomy_view_fragment.html:88
+#: templates/partial/collection_in_list.html:20
+#: templates/partial/fragment_in_list.html:15
+#: templates/partial/image_in_list.html:28
msgid "No title"
msgstr "Sans titre"
-#: templates/egonomy_all_pictures.html:49
-#: templates/egonomy_annotate_picture.html:39
-#: templates/egonomy_home.html:40
+#: templates/egonomy_annotate_picture.html:19
+#: templates/egonomy_view_fragment.html:30
+#: templates/partial/fragment_in_list.html:27
+#: templates/partial/image_in_list.html:41
+#: templates/partial/item_in_collection_list.html:26
+#: templates/partial/item_in_collection_list.html:82
+#: templates/partial/item_in_collection_mosaic.html:31
+#: templates/partial/item_in_collection_mosaic.html:71
+msgid "Create a fragment"
+msgstr "Créer un fragment"
+
+#: templates/egonomy_annotate_picture.html:23
+#: templates/egonomy_annotate_picture.html:25
+#: templates/egonomy_view_fragment.html:34
+#: templates/egonomy_view_fragment.html:36
+#: templates/partial/fragment_in_list.html:23
+#: templates/partial/image_in_list.html:37
+#: templates/partial/item_in_collection_list.html:22
+#: templates/partial/item_in_collection_list.html:24
+#: templates/partial/item_in_collection_list.html:78
+#: templates/partial/item_in_collection_list.html:80
+#: templates/partial/item_in_collection_mosaic.html:27
+#: templates/partial/item_in_collection_mosaic.html:29
+#: templates/partial/item_in_collection_mosaic.html:67
+#: templates/partial/item_in_collection_mosaic.html:69
+msgid "Add to a collection"
+msgstr "Ajouter à une collection"
+
+#: templates/egonomy_annotate_picture.html:75
+#: templates/partial/image_in_list.html:29
msgid "Author"
msgstr "Auteur"
-#: templates/egonomy_all_pictures.html:49
-#: templates/egonomy_home.html:40
-msgid "Not documented"
-msgstr "Non renseigné"
-
-#: templates/egonomy_annotate_picture.html:7
-msgid "Annotate a picture"
-msgstr "Annoter une image"
-
-#: templates/egonomy_annotate_picture.html:35
-msgid "Description"
-msgstr "Description"
-
-#: templates/egonomy_annotate_picture.html:43
+#: templates/egonomy_annotate_picture.html:79
msgid "Period"
msgstr "Période"
-#: templates/egonomy_annotate_picture.html:47
+#: templates/egonomy_annotate_picture.html:83
msgid "Production site"
msgstr "Site de production"
-#: templates/egonomy_annotate_picture.html:51
+#: templates/egonomy_annotate_picture.html:87
msgid "Localization"
msgstr "Localisation"
-#: templates/egonomy_annotate_picture.html:55
-#: templates/egonomy_create_fragment.html:229
-msgid "RMN keywords"
-msgstr "Mots-clés RMN"
+#: templates/egonomy_annotate_picture.html:94
+msgid "Keywords"
+msgstr "Mots-clés"
-#: templates/egonomy_annotate_picture.html:63
-#: templates/egonomy_create_fragment.html:236
-msgid "Pertimm title"
-msgstr "Titre Pertimm"
-
-#: templates/egonomy_annotate_picture.html:67
-#: templates/egonomy_create_fragment.html:243
-msgid "Pertimm description"
-msgstr "Description Pertimm"
+#: templates/egonomy_annotate_picture.html:102
+#: templates/egonomy_create_fragment.html:120
+#: templates/egonomy_view_fragment.html:151
+msgid "Fragments from this picture"
+msgstr "Fragments issus de cette image"
-#: templates/egonomy_annotate_picture.html:71
-#: templates/egonomy_create_fragment.html:250
-msgid "Pertimm thesaurus"
-msgstr "Thésaurus Pertimm"
+#: templates/egonomy_annotate_picture.html:114
+#: templates/egonomy_create_fragment.html:132
+#: templates/egonomy_view_fragment.html:163
+#: templates/partial/fragment_in_list.html:16
+msgid "Annotated by"
+msgstr "Annoté par"
-#: templates/egonomy_annotate_picture.html:76
-msgid "Save keywords"
-msgstr "Enregistrer les mots-clés"
+#: templates/egonomy_annotate_picture.html:119
+#: templates/egonomy_create_fragment.html:137
+#: templates/egonomy_view_fragment.html:168
+msgid "No fragment"
+msgstr "Pas de fragment"
-#: templates/egonomy_annotate_picture.html:79
-msgid "Last fragment created"
-msgstr "Dernier fragment créé"
+#: templates/egonomy_annotate_picture.html:124
+#: templates/egonomy_create_fragment.html:142
+#: templates/egonomy_view_fragment.html:173
+msgid "No collection"
+msgstr "Pas de collection"
-#: templates/egonomy_annotate_picture.html:80
#: templates/egonomy_base.html:36
-#: templates/egonomy_view_fragment.html:50
+#: templates/egonomy_view_fragment.html:100
+#: templates/partial/collection_in_list.html:21
msgid "by"
msgstr "par"
-#: templates/egonomy_annotate_picture.html:85
-#: templates/egonomy_view_fragment.html:69
-msgid "Create a fragment"
-msgstr "Créer un fragment"
-
-#: templates/egonomy_annotate_picture.html:91
-#: templates/egonomy_create_fragment.html:268
-#: templates/egonomy_view_fragment.html:100
-msgid "Fragments from this picture"
-msgstr "Fragments issus de cette image"
-
#: templates/egonomy_base.html:38
+#: templates/egonomy_newbase.html:67
+#: templates/egonomy_view_collection.html:138
msgid "Search"
msgstr "Rechercher"
#: templates/egonomy_base.html:47
+#: templates/egonomy_newbase.html:81
msgid "Log out"
msgstr "Se déconnecter"
#: templates/egonomy_base.html:49
+#: templates/egonomy_newbase.html:83
msgid "Log in"
msgstr "Se connecter"
-#: templates/egonomy_create_fragment.html:7
+#: templates/egonomy_create_fragment.html:6
msgid "Create or edit a fragment"
msgstr "Créer ou modifier un fragment"
-#: templates/egonomy_create_fragment.html:58
-msgid "Add all Senseetive keywords to yours"
-msgstr "Ajouter tous les mots-clés Senseetive aux votres"
+#: templates/egonomy_create_fragment.html:14
+msgid "New fragment"
+msgstr "Nouveau fragment"
-#: templates/egonomy_create_fragment.html:140
-#: templates/egonomy_create_fragment.html:257
-msgid "Request keywords from Senseetive API"
-msgstr "Demander les mots-clés à l'API Senseetive"
-
-#: templates/egonomy_create_fragment.html:181
+#: templates/egonomy_create_fragment.html:22
msgid "Erase the drawing"
msgstr "Effacer le tracé"
-#: templates/egonomy_create_fragment.html:182
+#: templates/egonomy_create_fragment.html:23
msgid "Back to the original drawing"
msgstr "Revenir au tracé d'origine"
-#: templates/egonomy_create_fragment.html:183
-msgid "New fragment"
-msgstr "Nouveau fragment"
-
-#: templates/egonomy_create_fragment.html:212
-#: templates/egonomy_view_fragment.html:37
+#: templates/egonomy_create_fragment.html:80
+#: templates/egonomy_view_fragment.html:87
msgid "Source picture"
msgstr "Image source"
-#: templates/egonomy_create_fragment.html:216
-#: templates/egonomy_create_fragment.html:217
+#: templates/egonomy_create_fragment.html:84
+#: templates/egonomy_create_fragment.html:85
+#: templates/egonomy_view_fragment.html:91
msgid "Fragment's title"
msgstr "Titre du fragment"
-#: templates/egonomy_create_fragment.html:220
-#: templates/egonomy_view_fragment.html:41
+#: templates/egonomy_create_fragment.html:88
+#: templates/egonomy_view_fragment.html:95
msgid "Fragment's description"
msgstr "Description du fragment"
-#: templates/egonomy_create_fragment.html:224
-#: templates/egonomy_view_fragment.html:45
-msgid "Users keywords"
-msgstr "Mots-clés Utilisateurs"
-
-#: templates/egonomy_create_fragment.html:231
-msgid "Add all RMN keywords to yours"
-msgstr "Ajouter tous les mots-clés RMN aux votres"
+#: templates/egonomy_create_fragment.html:97
+#: templates/egonomy_view_fragment.html:138
+msgid "Fragment's keywords"
+msgstr "Mots-clés du fragment"
-#: templates/egonomy_create_fragment.html:238
-msgid "Add all Pertimm title keywords to yours"
-msgstr "Ajouter tous les mots-clés du titre Pertimm aux votres"
+#: templates/egonomy_create_fragment.html:101
+msgid "Source picture's keywords"
+msgstr "Mots-clés de l'image source"
-#: templates/egonomy_create_fragment.html:245
-msgid "Add all Pertimm description keywords to yours"
-msgstr "Ajouter tous les mots-clés de la description Pertimm aux votres"
-
-#: templates/egonomy_create_fragment.html:252
-msgid "Add all Pertimm thesaurus keywords to yours"
-msgstr "Ajouter les mots-clés du thésaurus Pertimm aux votres"
-
-#: templates/egonomy_create_fragment.html:256
+#: templates/egonomy_create_fragment.html:111
msgid "Senseetive keywords"
msgstr "Mots-clés Senseetive"
-#: templates/egonomy_create_fragment.html:261
+#: templates/egonomy_create_fragment.html:112
+#: templates/egonomy_create_fragment.html:242
+msgid "Request keywords from Senseetive API"
+msgstr "Demander les mots-clés à l'API Senseetive"
+
+#: templates/egonomy_create_fragment.html:116
msgid "Save the fragment"
msgstr "Enregistrer le fragment"
+#: templates/egonomy_create_fragment.html:191
+msgid "Add all Senseetive keywords to yours"
+msgstr "Ajouter tous les mots-clés Senseetive aux votres"
+
#: templates/egonomy_home.html:6
msgid "Home"
msgstr "Accueil"
-#: templates/egonomy_home.html:12
+#: templates/egonomy_home.html:18
msgid "Last annotated pictures"
msgstr "Dernières images annotées"
-#: templates/egonomy_home.html:47
+#: templates/egonomy_home.html:31
msgid "Last created fragments"
msgstr "Derniers fragments créés"
-#: templates/egonomy_home.html:61
-msgid "Fragment from"
-msgstr "Fragment de"
+#: templates/egonomy_newbase.html:28
+msgid "Add to the collection"
+msgstr "Ajouter à la collection"
+
+#: templates/egonomy_newbase.html:34
+msgid "Add to"
+msgstr "Ajouter à"
+
+#: templates/egonomy_newbase.html:44
+msgid "Image comment"
+msgstr "Commentaire de l'image"
+
+#: templates/egonomy_newbase.html:79
+msgid "Hello"
+msgstr "Bonjour"
+
+#: templates/egonomy_newbase.html:88
+msgid "explore"
+msgstr "explorer"
+
+#: templates/egonomy_newbase.html:90
+msgid "collect"
+msgstr "collectionner"
-#: templates/egonomy_view_fragment.html:7
+#: templates/egonomy_newbase.html:98
+msgid "my collections"
+msgstr "mes collections"
+
+#: templates/egonomy_newbase.html:100
+msgid "my fragments"
+msgstr "mes fragments"
+
+#: templates/egonomy_view_collection.html:5
+msgid "View a collection"
+msgstr "Voir une collection"
+
+#: templates/egonomy_view_collection.html:100
+msgid "Display"
+msgstr "Afficher"
+
+#: templates/egonomy_view_collection.html:101
+msgid "Hide"
+msgstr "Masquer"
+
+#: templates/egonomy_view_collection.html:101
+msgid "the comments"
+msgstr "les commentaires"
+
+#: templates/egonomy_view_collection.html:106
+msgid "Collection parameters"
+msgstr "Paramètres de la collection"
+
+#: templates/egonomy_view_fragment.html:6
msgid "View a fragment"
msgstr "Voir un fragment"
-#: templates/egonomy_view_fragment.html:49
-msgid "Last modification"
-msgstr "Dernière modification"
-
-#: templates/egonomy_view_fragment.html:55
+#: templates/egonomy_view_fragment.html:20
msgid "Modify this fragment"
msgstr "Modifier ce fragment"
-#: templates/egonomy_view_fragment.html:64
+#: templates/egonomy_view_fragment.html:23
+#: templates/partial/fragment_in_list.html:29
+msgid ""
+"Do you really want to delete this fragment ? Warning : this action est "
+"irreversible."
+msgstr "Voulez-vous vraiment supprimer ce fragment ? Attention : cette action est "
+"irréversible."
+
+#: templates/egonomy_view_fragment.html:23
+#: templates/partial/fragment_in_list.html:29
+msgid "Delete this fragment"
+msgstr "Supprimer ce fragment"
+
+#: templates/egonomy_view_fragment.html:27
msgid "Duplicate this fragment"
msgstr "Dupliquer ce fragment"
-#: templates/egonomy_view_fragment.html:74
+#: templates/egonomy_view_fragment.html:99
+msgid "Last modification"
+msgstr "Dernière modification"
+
+#: templates/egonomy_view_fragment.html:107
msgid "See the fragment in its full picture"
msgstr "Voir le fragment dans l'image entière"
-#: templates/egonomy_view_fragment.html:87
+#: templates/egonomy_view_fragment.html:121
msgid "See the fragment only"
msgstr "Voir le fragment seul"
+#: templates/partial/fragment_in_list.html:15
+msgid "Fragment from"
+msgstr "Fragment de"
+
+#: templates/partial/fragment_in_list.html:20
+#: templates/partial/image_in_list.html:34
+#: templates/partial/item_in_collection_list.html:19
+#: templates/partial/item_in_collection_list.html:75
+#: templates/partial/item_in_collection_mosaic.html:24
+#: templates/partial/item_in_collection_mosaic.html:64
+msgid "Share on Twitter"
+msgstr "Partage sur Twitter"
+
+#: templates/partial/fragment_in_list.html:21
+#: templates/partial/image_in_list.html:35
+#: templates/partial/item_in_collection_list.html:20
+#: templates/partial/item_in_collection_list.html:76
+#: templates/partial/item_in_collection_mosaic.html:25
+#: templates/partial/item_in_collection_mosaic.html:65
+msgid "Share on Facebook"
+msgstr "Partager sur Facebook"
+
+#: templates/partial/fragment_in_list.html:25
+#: templates/partial/image_in_list.html:39
+msgid "Log in to add to a collection"
+msgstr "Se connecter pour ajouter à une collection"
+
+#: templates/partial/image_in_list.html:29
+msgid "Not documented"
+msgstr "Non renseigné"
+
#: templates/registration/login.html:5
msgid "Login"
msgstr "Se connecter"
Binary file src/egonomy/static/egonomy/img/slideshow-controls.png has changed
--- a/src/egonomy/static/egonomy/js/slideshow.js Fri Jun 28 15:47:00 2013 +0200
+++ b/src/egonomy/static/egonomy/js/slideshow.js Fri Jun 28 16:14:01 2013 +0200
@@ -71,13 +71,36 @@
}
}
- function nextSlide() {
+ var playInterval, playing = false;
+
+ function toggleSlideShow() {
+ clearInterval(playInterval);
+ playing = !playing;
+ var jqppbtn = $(".play-pause");
+ if (playing) {
+ jqppbtn.addClass("pause");
+ playInterval = setInterval(nextSlide,4000,false);
+ } else {
+ jqppbtn.removeClass("pause");
+ }
+ return false;
+ }
+
+ function nextSlide(resetInterval) {
+ if (!!resetInterval && playing) {
+ playing = false;
+ toggleSlideShow();
+ }
currentSlide = (currentSlide + 1) % slides.length;
showSlide();
return false;
}
- function prevSlide() {
+ function prevSlide(resetInterval) {
+ if (!!resetInterval && playing) {
+ playing = false;
+ toggleSlideShow();
+ }
currentSlide = (currentSlide > 0 ? currentSlide - 1 : slides.length - 1);
showSlide();
return false;
@@ -126,20 +149,8 @@
&& typeof document.webkitIsFullScreen === "undefined") {
$(".full-screen").remove();
}
-
- var playInterval, playing = false;
-
- $(".play-pause").click(function() {
- clearInterval(playInterval);
- playing = !playing;
- if (playing) {
- $(this).addClass("pause");
- playInterval = setInterval(nextSlide,4000);
- } else {
- $(this).removeClass("pause");
- }
- return false;
- });
+
+ $(".play-pause").click(toggleSlideShow);
slides.forEach(function(slide, k) {
if (!slide.path) {
@@ -158,4 +169,25 @@
jqwin.resize(showSlide);
+ $(document).keydown(function(e) {
+ if (e.keyCode === 122) { // F11
+ fullScreen();
+ return false;
+ }
+ if (e.keyCode === 32) { // Space
+ jqControls.show();
+ resetTO();
+ toggleSlideShow();
+ return false;
+ }
+ if (e.keyCode === 37) { // Left-Arrow
+ prevSlide(true);
+ return false;
+ }
+ if (e.keyCode === 39) { // Right-Arrow
+ nextSlide(true);
+ return false;
+ }
+ });
+
});
\ No newline at end of file
--- a/src/egonomy/templates/egonomy_all_collections.html Fri Jun 28 15:47:00 2013 +0200
+++ b/src/egonomy/templates/egonomy_all_collections.html Fri Jun 28 16:14:01 2013 +0200
@@ -4,7 +4,7 @@
{% load thumbnail %}
{% load navigation %}
-{% block title %}{% trans "All collection" %}{% endblock %}
+{% block title %}{% trans "All collections" %}{% endblock %}
{% block css_page %}
<style>
--- a/src/egonomy/templates/egonomy_newbase.html Fri Jun 28 15:47:00 2013 +0200
+++ b/src/egonomy/templates/egonomy_newbase.html Fri Jun 28 16:14:01 2013 +0200
@@ -76,7 +76,7 @@
</form>
</li>
{% if user.is_authenticated %}
- <li class="hello-user">Bonjour <a href="{% url 'user_fragments' username=user %}">{{ user.username }}</a>
+ <li class="hello-user">{% trans "Hello" %} <a href="{% url 'user_fragments' username=user %}">{{ user.username }}</a>
<li><span class="dot-6"></span></li>
<li><a href="{% url 'logout' %}?next={% url 'home' %}">{% trans "Log out" %}</a></li>
{% else %}
@@ -85,9 +85,9 @@
</ul>
<nav>
<ul class="nav clearfix">
- <li><a href="{% url 'all_pictures' %}">explorer</a></li>
+ <li><a href="{% url 'all_pictures' %}">{% trans "explore" %}</a></li>
<li><span class="dot-10"></span></li>
- <li><a href="{% url 'all_collections' %}">collectionner</a></li>
+ <li><a href="{% url 'all_collections' %}">{% trans "collect" %}</a></li>
<!--li><span class="dot-10"></span></li>
<li><a href="#">créer</a></li>
<li><span class="dot-10"></span></li>
@@ -95,9 +95,9 @@
</ul>
{% if user.is_authenticated %}
<ul class="sub-nav clearfix">
- <li><a href="{% url 'user_collections' username=user %}" {% if user_collections %}class="active"{% endif %}>mes collections</a></li>
+ <li><a href="{% url 'user_collections' username=user %}" {% if user_collections %}class="active"{% endif %}>{% trans "my collections" %}</a></li>
<li><span class="dot-6"></span></li>
- <li><a href="{% url 'user_fragments' username=user %}" {% if user_fragments %}class="active"{% endif %}>mes fragments</a></li>
+ <li><a href="{% url 'user_fragments' username=user %}" {% if user_fragments %}class="active"{% endif %}>{% trans "my fragments" %}</a></li>
<!--li><span class="dot-6"></span></li>
<li><a href="#">mon profil</a></li-->
</ul>
