# HG changeset patch
# User cavaliet
# Date 1360088395 -3600
# Node ID a7ace38e92a40c8bc5b8d47ca6ca27725d83dfb2
# Parent  48614929b87abc67adc16c3f0a87d3f8cb711c06
update languages. little debug.

diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/config.py.tmpl
--- a/src/egonomy/config.py.tmpl	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/config.py.tmpl	Tue Feb 05 19:19:55 2013 +0100
@@ -6,6 +6,8 @@
 WEB_URL = 'http://localhost/'
 STATIC_URL = BASE_URL + 'static/site/'
 
+LOGIN_URL = BASE_URL + "ego/login/"
+
 DEBUG = True
 
 DATABASES = {
@@ -55,11 +57,6 @@
 STATIC_URL = BASE_STATIC_URL + "site/"
 
 
-# Local path to rmn pictures
-# TODO : remove
-RMN_PICT_ROOT = STATIC_ROOT + 'rmn/'
-
-
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'abc123'
 
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/locale/en/LC_MESSAGES/django.mo
Binary file src/egonomy/locale/en/LC_MESSAGES/django.mo has changed
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/locale/en/LC_MESSAGES/django.po
--- a/src/egonomy/locale/en/LC_MESSAGES/django.po	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/locale/en/LC_MESSAGES/django.po	Tue Feb 05 19:19:55 2013 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-29 05:48-0600\n"
+"POT-Creation-Date: 2013-02-05 10:34-0600\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,92 +17,82 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:126
+#: settings.py:129
 msgid "French"
 msgstr ""
 
-#: settings.py:127
+#: settings.py:130
 msgid "English"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:5
+#: templates/egonomy_all_pictures.html:7
+#: templates/egonomy_all_pictures.html:12 templates/egonomy_home.html:23
+msgid "All pictures"
+msgstr ""
+
+#: templates/egonomy_all_pictures.html:40
+#: templates/egonomy_annotate_picture.html:102
+#: templates/egonomy_create_fragment.html:103 templates/egonomy_home.html:50
+#: templates/egonomy_home.html.py:91 templates/egonomy_view_fragment.html:89
+msgid "Annotated by"
+msgstr ""
+
+#: templates/egonomy_annotate_picture.html:6
 msgid "Annotate a picture"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:19
-#: templates/egonomy_create_fragment.html:38
-#: templates/egonomy_view_fragment.html:26
+#: templates/egonomy_annotate_picture.html:26
 msgid "Description"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:23
+#: templates/egonomy_annotate_picture.html:30
 msgid "Author"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:27
+#: templates/egonomy_annotate_picture.html:34
 msgid "Period"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:31
+#: templates/egonomy_annotate_picture.html:38
 msgid "Production site"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:35
+#: templates/egonomy_annotate_picture.html:42
 msgid "Localization"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:39
+#: templates/egonomy_annotate_picture.html:46
 msgid "RMN keywords"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:43
-#: templates/egonomy_create_fragment.html:42
-#: templates/egonomy_view_fragment.html:30
+#: templates/egonomy_annotate_picture.html:50
+#: templates/egonomy_create_fragment.html:51
+#: templates/egonomy_view_fragment.html:37
 msgid "Users keywords"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:48
-#: templates/egonomy_view_fragment.html:35
+#: templates/egonomy_annotate_picture.html:55
+#: templates/egonomy_view_fragment.html:42
 msgid "Save keywords"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:51
-#: templates/egonomy_create_fragment.html:50
-#: templates/egonomy_view_fragment.html:38
+#: templates/egonomy_annotate_picture.html:58
+#: templates/egonomy_create_fragment.html:59
+#: templates/egonomy_view_fragment.html:45
 msgid "Last modification"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:57
+#: templates/egonomy_annotate_picture.html:64
+#: templates/egonomy_view_fragment.html:51
 msgid "Create a fragment"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:63
-#: templates/egonomy_create_fragment.html:62
-#: templates/egonomy_view_fragment.html:47
+#: templates/egonomy_annotate_picture.html:70
+#: templates/egonomy_create_fragment.html:71
+#: templates/egonomy_view_fragment.html:57
 msgid "Fragments from this picture"
 msgstr ""
 
-#: templates/egonomy_annotate_picture.html:76
-#: templates/egonomy_annotate_picture.html:89
-#: templates/egonomy_annotate_picture.html:102
-#: templates/egonomy_annotate_picture.html:115
-#: templates/egonomy_annotate_picture.html:128
-#: templates/egonomy_create_fragment.html:75
-#: templates/egonomy_create_fragment.html:88
-#: templates/egonomy_create_fragment.html:101
-#: templates/egonomy_create_fragment.html:114
-#: templates/egonomy_create_fragment.html:127 templates/egonomy_home.html:20
-#: templates/egonomy_home.html.py:28 templates/egonomy_home.html:36
-#: templates/egonomy_home.html.py:44 templates/egonomy_home.html:64
-#: templates/egonomy_home.html.py:77 templates/egonomy_home.html:90
-#: templates/egonomy_home.html.py:103 templates/egonomy_view_fragment.html:60
-#: templates/egonomy_view_fragment.html:73
-#: templates/egonomy_view_fragment.html:86
-#: templates/egonomy_view_fragment.html:99
-#: templates/egonomy_view_fragment.html:112
-msgid "Annotated by"
-msgstr ""
-
 #: templates/egonomy_base.html:22
 msgid "by"
 msgstr ""
@@ -111,56 +101,97 @@
 msgid "Search"
 msgstr ""
 
-#: templates/egonomy_base.html:27
-msgid "Login"
+#: templates/egonomy_base.html:29
+msgid "Log out"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:5
+#: templates/egonomy_base.html:31
+msgid "Log in"
+msgstr ""
+
+#: templates/egonomy_create_fragment.html:6
 msgid "Create or edit a fragment"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:18
+#: templates/egonomy_create_fragment.html:19
 msgid "Erase the drawing"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:19
-msgid "Back to the original drawing"
-msgstr ""
-
 #: templates/egonomy_create_fragment.html:20
+msgid "Back to the original drawing"
+msgstr ""
+
+#: templates/egonomy_create_fragment.html:21
 msgid "New fragment"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:30
-#: templates/egonomy_view_fragment.html:22
+#: templates/egonomy_create_fragment.html:39
+#: templates/egonomy_view_fragment.html:29
 msgid "Source picture"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:34
-msgid "Title"
+#: templates/egonomy_create_fragment.html:43
+#: templates/egonomy_create_fragment.html:44
+msgid "Fragment's title"
 msgstr ""
 
-#: templates/egonomy_create_fragment.html:55
+#: templates/egonomy_create_fragment.html:47
+#: templates/egonomy_view_fragment.html:33
+msgid "Fragment's description"
+msgstr ""
+
+#: templates/egonomy_create_fragment.html:64
 msgid "Save the fragment"
 msgstr ""
 
-#: templates/egonomy_home.html:5
+#: templates/egonomy_home.html:6
 msgid "Home"
 msgstr ""
 
 #: templates/egonomy_home.html:12
+msgid "No results for"
+msgstr ""
+
+#: templates/egonomy_home.html:14
+msgid "Search results for"
+msgstr ""
+
+#: templates/egonomy_home.html:22
+msgid "Corresponding pictures"
+msgstr ""
+
+#: templates/egonomy_home.html:22
 msgid "Last annotated pictures"
 msgstr ""
 
-#: templates/egonomy_home.html:51
+#: templates/egonomy_home.html:58
+msgid "Corresponding fragments"
+msgstr ""
+
+#: templates/egonomy_home.html:58
 msgid "Last created fragments"
 msgstr ""
 
-#: templates/egonomy_home.html:63 templates/egonomy_home.html.py:76
-#: templates/egonomy_home.html:89 templates/egonomy_home.html.py:102
+#: templates/egonomy_home.html:90
 msgid "Fragment from"
 msgstr ""
 
-#: templates/egonomy_view_fragment.html:5
+#: templates/egonomy_view_fragment.html:6
 msgid "View a fragment"
 msgstr ""
+
+#: templates/registration/login.html:5
+msgid "Login"
+msgstr ""
+
+#: templates/registration/login.html:9
+msgid "Sorry, that's not a valid username or password."
+msgstr ""
+
+#: templates/registration/login.html:20
+msgid "Forget password?"
+msgstr ""
+
+#: templates/registration/login.html:23
+msgid "login"
+msgstr ""
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/locale/fr/LC_MESSAGES/django.mo
Binary file src/egonomy/locale/fr/LC_MESSAGES/django.mo has changed
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/locale/fr/LC_MESSAGES/django.po
--- a/src/egonomy/locale/fr/LC_MESSAGES/django.po	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/locale/fr/LC_MESSAGES/django.po	Tue Feb 05 19:19:55 2013 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-29 05:47-0600\n"
+"POT-Creation-Date: 2013-02-05 10:34-0600\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,92 +18,85 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: settings.py:126
+#: settings.py:129
 msgid "French"
 msgstr "Français"
 
-#: settings.py:127
+#: settings.py:130
 msgid "English"
 msgstr "Anglais"
 
-#: templates/egonomy_annotate_picture.html:5
+#: templates/egonomy_all_pictures.html:7
+#: templates/egonomy_all_pictures.html:12
+#: templates/egonomy_home.html:23
+msgid "All pictures"
+msgstr "Toutes les images"
+
+#: templates/egonomy_all_pictures.html:40
+#: templates/egonomy_annotate_picture.html:102
+#: templates/egonomy_create_fragment.html:103
+#: templates/egonomy_home.html:50
+#: templates/egonomy_home.html.py:91
+#: templates/egonomy_view_fragment.html:89
+msgid "Annotated by"
+msgstr "Annoté par"
+
+#: templates/egonomy_annotate_picture.html:6
 msgid "Annotate a picture"
 msgstr "Annoter une image"
 
-#: templates/egonomy_annotate_picture.html:19
-#: templates/egonomy_create_fragment.html:38
-#: templates/egonomy_view_fragment.html:26
+#: templates/egonomy_annotate_picture.html:26
 msgid "Description"
 msgstr "Description"
 
-#: templates/egonomy_annotate_picture.html:23
+#: templates/egonomy_annotate_picture.html:30
 msgid "Author"
 msgstr "Auteur"
 
-#: templates/egonomy_annotate_picture.html:27
+#: templates/egonomy_annotate_picture.html:34
 msgid "Period"
 msgstr "Période"
 
-#: templates/egonomy_annotate_picture.html:31
+#: templates/egonomy_annotate_picture.html:38
 msgid "Production site"
 msgstr "Site de production"
 
-#: templates/egonomy_annotate_picture.html:35
+#: templates/egonomy_annotate_picture.html:42
 msgid "Localization"
 msgstr "Localisation"
 
-#: templates/egonomy_annotate_picture.html:39
+#: templates/egonomy_annotate_picture.html:46
 msgid "RMN keywords"
 msgstr "Mots-clés RMN"
 
-#: templates/egonomy_annotate_picture.html:43
-#: templates/egonomy_create_fragment.html:42
-#: templates/egonomy_view_fragment.html:30
+#: templates/egonomy_annotate_picture.html:50
+#: templates/egonomy_create_fragment.html:51
+#: templates/egonomy_view_fragment.html:37
 msgid "Users keywords"
 msgstr "Mots-clés Utilisateurs"
 
-#: templates/egonomy_annotate_picture.html:48
-#: templates/egonomy_view_fragment.html:35
+#: templates/egonomy_annotate_picture.html:55
+#: templates/egonomy_view_fragment.html:42
 msgid "Save keywords"
 msgstr "Enregistrer les mots-clés"
 
-#: templates/egonomy_annotate_picture.html:51
-#: templates/egonomy_create_fragment.html:50
-#: templates/egonomy_view_fragment.html:38
+#: templates/egonomy_annotate_picture.html:58
+#: templates/egonomy_create_fragment.html:59
+#: templates/egonomy_view_fragment.html:45
 msgid "Last modification"
 msgstr "Dernière modification"
 
-#: templates/egonomy_annotate_picture.html:57
+#: templates/egonomy_annotate_picture.html:64
+#: templates/egonomy_view_fragment.html:51
 msgid "Create a fragment"
 msgstr "Créer un fragment"
 
-#: templates/egonomy_annotate_picture.html:63
-#: templates/egonomy_create_fragment.html:62
-#: templates/egonomy_view_fragment.html:47
+#: templates/egonomy_annotate_picture.html:70
+#: templates/egonomy_create_fragment.html:71
+#: templates/egonomy_view_fragment.html:57
 msgid "Fragments from this picture"
 msgstr "Fragments de cette image"
 
-#: templates/egonomy_annotate_picture.html:76
-#: templates/egonomy_annotate_picture.html:89
-#: templates/egonomy_annotate_picture.html:102
-#: templates/egonomy_annotate_picture.html:115
-#: templates/egonomy_annotate_picture.html:128
-#: templates/egonomy_create_fragment.html:75
-#: templates/egonomy_create_fragment.html:88
-#: templates/egonomy_create_fragment.html:101
-#: templates/egonomy_create_fragment.html:114
-#: templates/egonomy_create_fragment.html:127 templates/egonomy_home.html:20
-#: templates/egonomy_home.html.py:28 templates/egonomy_home.html:36
-#: templates/egonomy_home.html.py:44 templates/egonomy_home.html:64
-#: templates/egonomy_home.html.py:77 templates/egonomy_home.html:90
-#: templates/egonomy_home.html.py:103 templates/egonomy_view_fragment.html:60
-#: templates/egonomy_view_fragment.html:73
-#: templates/egonomy_view_fragment.html:86
-#: templates/egonomy_view_fragment.html:99
-#: templates/egonomy_view_fragment.html:112
-msgid "Annotated by"
-msgstr "Annoté par"
-
 #: templates/egonomy_base.html:22
 msgid "by"
 msgstr "par"
@@ -112,56 +105,98 @@
 msgid "Search"
 msgstr "Rechercher"
 
-#: templates/egonomy_base.html:27
-msgid "Login"
+#: templates/egonomy_base.html:29
+msgid "Log out"
+msgstr "Se déconnecter"
+
+#: templates/egonomy_base.html:31
+msgid "Log in"
 msgstr "Se connecter"
 
-#: templates/egonomy_create_fragment.html:5
+#: templates/egonomy_create_fragment.html:6
 msgid "Create or edit a fragment"
 msgstr "Créer ou modifier un fragment"
 
-#: templates/egonomy_create_fragment.html:18
+#: templates/egonomy_create_fragment.html:19
 msgid "Erase the drawing"
 msgstr "Effacer le tracé"
 
-#: templates/egonomy_create_fragment.html:19
+#: templates/egonomy_create_fragment.html:20
 msgid "Back to the original drawing"
 msgstr "Revenir au tracé d'origine"
 
-#: templates/egonomy_create_fragment.html:20
+#: templates/egonomy_create_fragment.html:21
 msgid "New fragment"
 msgstr "Nouveau fragment"
 
-#: templates/egonomy_create_fragment.html:30
-#: templates/egonomy_view_fragment.html:22
+#: templates/egonomy_create_fragment.html:39
+#: templates/egonomy_view_fragment.html:29
 msgid "Source picture"
 msgstr "Image source"
 
-#: templates/egonomy_create_fragment.html:34
-msgid "Title"
-msgstr "Titre"
+#: templates/egonomy_create_fragment.html:43
+#: templates/egonomy_create_fragment.html:44
+msgid "Fragment's title"
+msgstr "Titre du fragment"
 
-#: templates/egonomy_create_fragment.html:55
+#: templates/egonomy_create_fragment.html:47
+#: templates/egonomy_view_fragment.html:33
+msgid "Fragment's description"
+msgstr "Description du fragment"
+
+#: templates/egonomy_create_fragment.html:64
 msgid "Save the fragment"
 msgstr "Enregistrer le fragment"
 
-#: templates/egonomy_home.html:5
+#: templates/egonomy_home.html:6
 msgid "Home"
 msgstr "Accueil"
 
 #: templates/egonomy_home.html:12
+msgid "No results for"
+msgstr "Pas de résultats pour"
+
+#: templates/egonomy_home.html:14
+msgid "Search results for"
+msgstr "Résultats de recherche pour"
+
+#: templates/egonomy_home.html:22
+msgid "Corresponding pictures"
+msgstr "Images correspondantes"
+
+#: templates/egonomy_home.html:22
 msgid "Last annotated pictures"
 msgstr "Dernières images annotées"
 
-#: templates/egonomy_home.html:51
+#: templates/egonomy_home.html:58
+msgid "Corresponding fragments"
+msgstr "Fragments correspondants"
+
+#: templates/egonomy_home.html:58
 msgid "Last created fragments"
 msgstr "Derniers fragments créés"
 
-#: templates/egonomy_home.html:63 templates/egonomy_home.html.py:76
-#: templates/egonomy_home.html:89 templates/egonomy_home.html.py:102
+#: templates/egonomy_home.html:90
 msgid "Fragment from"
 msgstr "Fragment de"
 
-#: templates/egonomy_view_fragment.html:5
+#: templates/egonomy_view_fragment.html:6
 msgid "View a fragment"
 msgstr "Voir un fragment"
+
+#: templates/registration/login.html:5
+msgid "Login"
+msgstr "Se connecter"
+
+#: templates/registration/login.html:9
+msgid "Sorry, that's not a valid username or password."
+msgstr "Désolé, ce n'est pas un nom d'utilisateur ou un mot de passe valide."
+
+#: templates/registration/login.html:20
+msgid "Forget password?"
+msgstr "Mot de passe oublié ?"
+
+#: templates/registration/login.html:23
+msgid "login"
+msgstr "Se connecter"
+
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/templates/egonomy_all_pictures.html
--- a/src/egonomy/templates/egonomy_all_pictures.html	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/templates/egonomy_all_pictures.html	Tue Feb 05 19:19:55 2013 +0100
@@ -9,7 +9,7 @@
 {% block content %}
                 <div class="fullwidth">
                     <div class="fullwidth">
-                        <h2>{% trans "All pictures" %} nb_pages = {{nb_pages}}</h2>
+                        <h2>{% trans "All pictures" %}</h2>
 						{% if nb_pages %}<p>{% build_pagination nb_pages page "contents_page clickable" %}</p>{% endif %}
                         <ul class="fullwidth">
                           {% for img in results %}
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/templates/registration/login.html
--- a/src/egonomy/templates/registration/login.html	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/templates/registration/login.html	Tue Feb 05 19:19:55 2013 +0100
@@ -12,7 +12,7 @@
         <form action="" method='post' id="login-form">
             <div id="loginform_div" class="span-12">
             {% csrf_token %}
-            <input type="hidden" name="next" value="{% url 'home' %}" />
+            <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}{% url 'home' %}{% endif %}" />
             <ul id="login_fields_list">
             {{form.as_ul}}
             </ul>
diff -r 48614929b87a -r a7ace38e92a4 src/egonomy/views.py
--- a/src/egonomy/views.py	Tue Feb 05 17:10:18 2013 +0100
+++ b/src/egonomy/views.py	Tue Feb 05 19:19:55 2013 +0100
@@ -86,7 +86,7 @@
     page = request.GET.get("page") or 1
     page = int(page)
     
-    img_list = Image.objects.all()
+    img_list = Image.objects.all().order_by('pk')
     nb = 32
     paginator = Paginator(img_list, nb)
     try: