# HG changeset patch # User cavaliet # Date 1373463098 -7200 # Node ID fb6932ba9a2b502180f052df7759640c43644bfa # Parent 8a02a23cdaba80ea231ae697ac71a567497e93ce update registration and password management, and version number to 0.6.10 diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/__init__.py --- a/src/egonomy/__init__.py Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/__init__.py Wed Jul 10 15:31:38 2013 +0200 @@ -1,4 +1,4 @@ -VERSION = (0, 6, 9, "final", 1) +VERSION = (0, 6, 10, "final", 1) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/locale/en/LC_MESSAGES/django.mo Binary file src/egonomy/locale/en/LC_MESSAGES/django.mo has changed diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/locale/en/LC_MESSAGES/django.po --- a/src/egonomy/locale/en/LC_MESSAGES/django.po Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/locale/en/LC_MESSAGES/django.po Wed Jul 10 15:31:38 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-02 10:38-0500\n" +"POT-Creation-Date: 2013-07-10 08:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,27 +17,37 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:149 +#: settings.py:150 msgid "French" msgstr "" -#: settings.py:150 +#: settings.py:151 msgid "English" msgstr "" -#: views.py:105 views.py:129 +#: views.py:106 views.py:130 msgid "You are not allowed to modify this fragment." msgstr "" -#: views.py:331 +#: views.py:332 msgid "You are not allowed to delete this fragment." msgstr "" -#: views.py:583 +#: views.py:586 msgid "You are not allowed to delete this collection." msgstr "" -#: views.py:630 views.py:681 +#: views.py:616 templates/egonomy_annotate_picture.html:14 +#: templates/egonomy_create_fragment.html:14 +#: templates/egonomy_create_fragment.html:77 +#: templates/egonomy_view_fragment.html:100 +#: 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 "" + +#: views.py:654 views.py:709 msgid "You are not allowed to modify this collection." msgstr "" @@ -69,6 +79,10 @@ #: templates/egonomy_all_collections.html:35 templates/egonomy_newbase.html:49 #: templates/egonomy_view_collection.html:86 +#: templates/registration/password_change_form.html:9 +#: templates/registration/password_reset_confirm.html:10 +#: templates/registration/password_reset_form.html:10 +#: templates/registration/registration_form.html:9 msgid "Submit" msgstr "" @@ -109,25 +123,14 @@ msgid "Annotate a picture" msgstr "" -#: templates/egonomy_annotate_picture.html:14 -#: templates/egonomy_create_fragment.html:14 -#: templates/egonomy_create_fragment.html:77 -#: templates/egonomy_embed_slideshow.html:70 -#: templates/egonomy_view_fragment.html:100 -#: 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_annotate_picture.html:25 #: templates/egonomy_view_fragment.html:36 #: 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_list.html:84 #: templates/partial/item_in_collection_mosaic.html:31 -#: templates/partial/item_in_collection_mosaic.html:71 +#: templates/partial/item_in_collection_mosaic.html:73 msgid "Create a fragment" msgstr "" @@ -139,12 +142,12 @@ #: 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_list.html:82 #: 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 +#: templates/partial/item_in_collection_mosaic.html:71 msgid "Add to a collection" msgstr "" @@ -210,6 +213,8 @@ msgstr "" #: templates/egonomy_base.html:49 templates/egonomy_newbase.html:90 +#: templates/registration/activate.html:8 +#: templates/registration/password_reset_complete.html:7 msgid "Log in" msgstr "" @@ -259,7 +264,7 @@ msgstr "" #: templates/egonomy_create_fragment.html:108 -#: templates/egonomy_create_fragment.html:238 +#: templates/egonomy_create_fragment.html:247 msgid "Request keywords from Senseetive API" msgstr "" @@ -267,10 +272,6 @@ msgid "Save the fragment" msgstr "" -#: templates/egonomy_create_fragment.html:187 -msgid "Add all Senseetive keywords to yours" -msgstr "" - #: templates/egonomy_home.html:6 msgid "Home" msgstr "" @@ -432,18 +433,18 @@ #: 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_list.html:77 #: templates/partial/item_in_collection_mosaic.html:24 -#: templates/partial/item_in_collection_mosaic.html:64 +#: templates/partial/item_in_collection_mosaic.html:66 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_list.html:78 #: templates/partial/item_in_collection_mosaic.html:25 -#: templates/partial/item_in_collection_mosaic.html:65 +#: templates/partial/item_in_collection_mosaic.html:67 msgid "Share on Facebook" msgstr "" @@ -456,18 +457,47 @@ msgid "Not documented" msgstr "" -#: templates/partial/item_in_collection_list.html:27 -#: templates/partial/item_in_collection_list.html:83 +#: templates/partial/item_in_collection_list.html:28 +#: templates/partial/item_in_collection_list.html:86 +#: templates/partial/item_in_collection_mosaic.html:33 +#: templates/partial/item_in_collection_mosaic.html:75 msgid "" "Do you really want to remove this item from this collection ? Warning : this " "action est irreversible." msgstr "" -#: templates/partial/item_in_collection_list.html:27 -#: templates/partial/item_in_collection_list.html:83 +#: templates/partial/item_in_collection_list.html:28 +#: templates/partial/item_in_collection_list.html:86 +#: templates/partial/item_in_collection_mosaic.html:33 +#: templates/partial/item_in_collection_mosaic.html:75 msgid "Remove from this collection" msgstr "" +#: templates/registration/activate.html:7 +msgid "Account successfully activated" +msgstr "" + +#: templates/registration/activate.html:10 +msgid "Account activation failed" +msgstr "" + +#: templates/registration/activation_complete.html:6 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_email.txt:2 +msgid "Activate account at" +msgstr "" + +#: templates/registration/activation_email.txt:6 +#, python-format +msgid "Link is valid for %(expiration_days)s days." +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +msgid "Account activation on" +msgstr "" + #: templates/registration/login.html:5 msgid "Login" msgstr "" @@ -476,10 +506,39 @@ msgid "Sorry, that's not a valid username or password." msgstr "" -#: templates/registration/login.html:20 -msgid "Forget password?" +#: templates/registration/login.html:16 +msgid "login" +msgstr "" + +#: templates/registration/login.html:18 +msgid "Still not a user ? Create an account" +msgstr "" + +#: templates/registration/login.html:19 +msgid "Forgot password ?" +msgstr "" + +#: templates/registration/password_change_done.html:6 +msgid "Password changed" msgstr "" -#: templates/registration/login.html:23 -msgid "login" +#: templates/registration/password_reset_complete.html:6 +msgid "Password reset successfully" +msgstr "" + +#: templates/registration/password_reset_confirm.html:13 +msgid "Password reset failed" msgstr "" + +#: templates/registration/password_reset_done.html:6 +msgid "Email with password reset instructions has been sent." +msgstr "" + +#: templates/registration/password_reset_email.html:2 +#, python-format +msgid "Reset password at %(site_name)s" +msgstr "" + +#: templates/registration/registration_complete.html:6 +msgid "You are now registered. Activation email sent." +msgstr "" diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/locale/fr/LC_MESSAGES/django.mo Binary file src/egonomy/locale/fr/LC_MESSAGES/django.mo has changed diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/locale/fr/LC_MESSAGES/django.po --- a/src/egonomy/locale/fr/LC_MESSAGES/django.po Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/locale/fr/LC_MESSAGES/django.po Wed Jul 10 15:31:38 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-02 10:38-0500\n" +"POT-Creation-Date: 2013-07-10 08:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,29 +18,40 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: settings.py:149 +#: settings.py:150 msgid "French" msgstr "Français" -#: settings.py:150 +#: settings.py:151 msgid "English" msgstr "Anglais" -#: views.py:105 -#: views.py:129 +#: views.py:106 +#: views.py:130 msgid "You are not allowed to modify this fragment." msgstr "Vous n'êtes pas autorisé à modifier ce fragment." -#: views.py:331 +#: views.py:332 msgid "You are not allowed to delete this fragment." msgstr "Vous n'êtes pas autorisé à supprimer ce fragment." -#: views.py:583 +#: views.py:586 msgid "You are not allowed to delete this collection." msgstr "Vous n'êtes pas autorisé à supprimer cette collection." -#: views.py:630 -#: views.py:681 +#: views.py:616 +#: templates/egonomy_annotate_picture.html:14 +#: templates/egonomy_create_fragment.html:14 +#: templates/egonomy_create_fragment.html:77 +#: templates/egonomy_view_fragment.html:100 +#: 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" + +#: views.py:654 +#: views.py:709 msgid "You are not allowed to modify this collection." msgstr "Vous n'êtes pas autorisé à modifier cette collection." @@ -74,6 +85,10 @@ #: templates/egonomy_all_collections.html:35 #: templates/egonomy_newbase.html:49 #: templates/egonomy_view_collection.html:86 +#: templates/registration/password_change_form.html:9 +#: templates/registration/password_reset_confirm.html:10 +#: templates/registration/password_reset_form.html:10 +#: templates/registration/registration_form.html:9 msgid "Submit" msgstr "Envoyer" @@ -116,25 +131,14 @@ msgid "Annotate a picture" msgstr "Annoter une image" -#: templates/egonomy_annotate_picture.html:14 -#: templates/egonomy_create_fragment.html:14 -#: templates/egonomy_create_fragment.html:77 -#: templates/egonomy_embed_slideshow.html:70 -#: templates/egonomy_view_fragment.html:100 -#: 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_annotate_picture.html:25 #: templates/egonomy_view_fragment.html:36 #: 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_list.html:84 #: templates/partial/item_in_collection_mosaic.html:31 -#: templates/partial/item_in_collection_mosaic.html:71 +#: templates/partial/item_in_collection_mosaic.html:73 msgid "Create a fragment" msgstr "Créer un fragment" @@ -146,12 +150,12 @@ #: 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_list.html:82 #: 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 +#: templates/partial/item_in_collection_mosaic.html:71 msgid "Add to a collection" msgstr "Ajouter à une collection" @@ -221,6 +225,8 @@ #: templates/egonomy_base.html:49 #: templates/egonomy_newbase.html:90 +#: templates/registration/activate.html:8 +#: templates/registration/password_reset_complete.html:7 msgid "Log in" msgstr "Se connecter" @@ -270,7 +276,7 @@ msgstr "Mots-clés Senseetive" #: templates/egonomy_create_fragment.html:108 -#: templates/egonomy_create_fragment.html:238 +#: templates/egonomy_create_fragment.html:247 msgid "Request keywords from Senseetive API" msgstr "Demander les mots-clés à l'API Senseetive" @@ -278,10 +284,6 @@ msgid "Save the fragment" msgstr "Enregistrer le fragment" -#: templates/egonomy_create_fragment.html:187 -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" @@ -445,18 +447,18 @@ #: 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_list.html:77 #: templates/partial/item_in_collection_mosaic.html:24 -#: templates/partial/item_in_collection_mosaic.html:64 +#: templates/partial/item_in_collection_mosaic.html:66 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_list.html:78 #: templates/partial/item_in_collection_mosaic.html:25 -#: templates/partial/item_in_collection_mosaic.html:65 +#: templates/partial/item_in_collection_mosaic.html:67 msgid "Share on Facebook" msgstr "Partager sur Facebook" @@ -469,19 +471,48 @@ msgid "Not documented" msgstr "Non renseigné" -#: templates/partial/item_in_collection_list.html:27 -#: templates/partial/item_in_collection_list.html:83 +#: templates/partial/item_in_collection_list.html:28 +#: templates/partial/item_in_collection_list.html:86 +#: templates/partial/item_in_collection_mosaic.html:33 +#: templates/partial/item_in_collection_mosaic.html:75 msgid "" "Do you really want to remove this item from this collection ? Warning : this " "action est irreversible." -msgstr "Voulez-vous vraiment supprimer cet élément de cette collection ? Attention : cette action " -"est irréversible." +msgstr "Voulez-vous vraiment supprimer cet élément de cette collection ? Attention : " +"cette action est irréversible." -#: templates/partial/item_in_collection_list.html:27 -#: templates/partial/item_in_collection_list.html:83 +#: templates/partial/item_in_collection_list.html:28 +#: templates/partial/item_in_collection_list.html:86 +#: templates/partial/item_in_collection_mosaic.html:33 +#: templates/partial/item_in_collection_mosaic.html:75 msgid "Remove from this collection" msgstr "Supprimer de cette collection" +#: templates/registration/activate.html:7 +msgid "Account successfully activated" +msgstr "Compte activé avec succès" + +#: templates/registration/activate.html:10 +msgid "Account activation failed" +msgstr "L'activation du compte a échoué" + +#: templates/registration/activation_complete.html:6 +msgid "Your account is now activated." +msgstr "Votre compte est maintenant activé" + +#: templates/registration/activation_email.txt:2 +msgid "Activate account at" +msgstr "Activer votre compte sur" + +#: templates/registration/activation_email.txt:6 +#, python-format +msgid "Link is valid for %(expiration_days)s days." +msgstr "Le lien est valide pendant %(expiration_days)s jours." + +#: templates/registration/activation_email_subject.txt:1 +msgid "Account activation on" +msgstr "Activation du compte sur" + #: templates/registration/login.html:5 msgid "Login" msgstr "Se connecter" @@ -490,11 +521,40 @@ 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 +#: templates/registration/login.html:16 msgid "login" msgstr "Se connecter" +#: templates/registration/login.html:18 +msgid "Still not a user ? Create an account" +msgstr "Vous n'avez pas de compte ? Créez un compte" + +#: templates/registration/login.html:19 +msgid "Forgot password ?" +msgstr "Mot de passe oublié ?" + +#: templates/registration/password_change_done.html:6 +msgid "Password changed" +msgstr "Le mot de passe a été modifié" + +#: templates/registration/password_reset_complete.html:6 +msgid "Password reset successfully" +msgstr "Le mot de passe a été réinitialisé avec succès" + +#: templates/registration/password_reset_confirm.html:13 +msgid "Password reset failed" +msgstr "La réinitialisation du mot de passe a échoué" + +#: templates/registration/password_reset_done.html:6 +msgid "Email with password reset instructions has been sent." +msgstr "L'email avec les instructions pour réinitialiser votre mot de passe a été envoyé." + +#: templates/registration/password_reset_email.html:2 +#, python-format +msgid "Reset password at %(site_name)s" +msgstr "Réinitialiser votre mot de passe sur %(site_name)s" + +#: templates/registration/registration_complete.html:6 +msgid "You are now registered. Activation email sent." +msgstr "Vous êtes maintenant enregistré. L'email d'activation du compte a été envoyé." + diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/settings.py --- a/src/egonomy/settings.py Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/settings.py Wed Jul 10 15:31:38 2013 +0200 @@ -129,6 +129,7 @@ ) INSTALLED_APPS = ( + 'egonomy', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -142,7 +143,6 @@ 'registration', 'sorl.thumbnail', 'haystack', - 'egonomy', ) ugettext = lambda s: s diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/templates/egonomy_newbase.html --- a/src/egonomy/templates/egonomy_newbase.html Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/templates/egonomy_newbase.html Wed Jul 10 15:31:38 2013 +0200 @@ -83,7 +83,7 @@ {% if user.is_authenticated %} -
  • {% trans "Hello" %} {{ user.username }} +
  • {% trans "Hello" %} {{ user.username }}
  • {% trans "Log out" %}
  • {% else %} diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/templates/registration/activation_complete.html --- a/src/egonomy/templates/registration/activation_complete.html Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/templates/registration/activation_complete.html Wed Jul 10 15:31:38 2013 +0200 @@ -4,5 +4,7 @@ {% block content %}

    {% trans "Your account is now activated." %}

    +

     

    +

    {% trans "Log in" %}

    {% endblock %} diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/templates/registration/login.html --- a/src/egonomy/templates/registration/login.html Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/templates/registration/login.html Wed Jul 10 15:31:38 2013 +0200 @@ -15,7 +15,9 @@ {{form.as_p}} +

     

    {% trans "Still not a user ? Create an account" %} +

    {% trans "Forgot password ?" %} {% endblock %} diff -r 8a02a23cdaba -r fb6932ba9a2b src/egonomy/templates/registration/password_reset_email.html --- a/src/egonomy/templates/registration/password_reset_email.html Mon Jul 08 18:55:01 2013 +0200 +++ b/src/egonomy/templates/registration/password_reset_email.html Wed Jul 10 15:31:38 2013 +0200 @@ -1,5 +1,5 @@ {% load i18n %} {% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: {% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid, token=token %} +{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %} {% endblock %}