# HG changeset patch # User verrierj # Date 1315412197 -7200 # Node ID caa1986245d7885d6ea51bb13b815d0c2f97f0f6 # Parent 64f24f8841ecd488b22d0bbdaf3df24c1c6e1425 Translation + naming conventions (PEP8) diff -r 64f24f8841ec -r caa1986245d7 src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed diff -r 64f24f8841ec -r caa1986245d7 src/ldt/ldt/locale/fr/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Wed Sep 07 17:32:29 2011 +0200 +++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Wed Sep 07 18:16:37 2011 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-07 15:34+0200\n" +"POT-Creation-Date: 2011-09-07 18:07+0200\n" "PO-Revision-Date: 2010-03-09 15:52+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -174,62 +174,62 @@ msgid "changed by" msgstr "modifié par" -#: .\ldt_utils\views.py:153 .\ldt_utils\views.py:546 .\ldt_utils\views.py:592 +#: .\ldt_utils\views.py:147 .\ldt_utils\views.py:540 .\ldt_utils\views.py:586 msgid "You can not access this project" msgstr "vous n'avez pas l'autorisation d'accéder à ce projet" -#: .\ldt_utils\views.py:758 +#: .\ldt_utils\views.py:752 #, python-format msgid "the project %(title)s is published. please unpublish before deleting." msgstr "Le projet %(title)s est publié. Déplublier le avant de l'effacer." -#: .\ldt_utils\views.py:759 +#: .\ldt_utils\views.py:753 msgid "can not delete the project. Please correct the following error" msgstr "" "Le projet ne peut pas être effacé. Veuillez corriger les erreurs suivantes." -#: .\ldt_utils\views.py:760 +#: .\ldt_utils\views.py:754 msgid "title error deleting project" msgstr "Erreur lors de l'effacement du projet" -#: .\ldt_utils\views.py:762 +#: .\ldt_utils\views.py:756 #, python-format msgid "please confirm deleting project %(title)s" msgstr "Confirmer l'effacement du projet intitulé %(title)s" -#: .\ldt_utils\views.py:763 +#: .\ldt_utils\views.py:757 msgid "confirm deletion" msgstr "Confirmation d'effacement" -#: .\ldt_utils\views.py:937 +#: .\ldt_utils\views.py:931 msgid "Problem when downloading file from url : " msgstr "Problème lors du téléchargement du fichier : " -#: .\ldt_utils\views.py:940 +#: .\ldt_utils\views.py:934 msgid "Problem when uploading file : " msgstr "Problème lors de l'upload du fichier : " -#: .\ldt_utils\views.py:1009 +#: .\ldt_utils\views.py:1003 #, python-format msgid "There is %(count)d error when deleting content" msgid_plural "There are %(count)d errors when deleting content" msgstr[0] "Il y a %(count)d erreur lors de l'effacement du contenu" msgstr[1] "Il y a %(count)d erreurs lors de l'effacement du contenu" -#: .\ldt_utils\views.py:1010 +#: .\ldt_utils\views.py:1004 msgid "title error deleting content" msgstr "Erreur lors de l'effacement du contenu" -#: .\ldt_utils\views.py:1012 +#: .\ldt_utils\views.py:1006 #, python-format msgid "Confirm delete content %(titles)s" msgstr "Veuillez confirmer l'effacement du contenu %(titles)s" -#: .\ldt_utils\views.py:1013 +#: .\ldt_utils\views.py:1007 msgid "confirm delete content" msgstr "Confirmation effacement contenu" -#: .\ldt_utils\views.py:1047 +#: .\ldt_utils\views.py:1041 #, python-format msgid "" "Content '%(title)s' is referenced by this project : %(project_titles)s. " @@ -367,7 +367,6 @@ #: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3 -#: .\user\templates\ldt\user\change_profile.html.py:52 msgid "name" msgstr "Nom" @@ -656,51 +655,53 @@ msgid "Filter" msgstr "Filtre" +#: .\templates\admin\index.html.py:18 .\templates\admin\page_index.html.py:18 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "Le modèle disponible dans l'application %(name)s." + +#: .\templates\admin\index.html.py:19 #: .\templates\admin\page_app_index.html.py:10 #: .\templates\admin\page_index.html.py:19 #, python-format msgid "%(name)s" msgstr "%(name)s" -#: .\templates\admin\page_base.html.py:20 -#: .\templates\admin\page_index.html.py:11 -msgid "Pages" -msgstr "Pages" - +#: .\templates\admin\index.html.py:29 #: .\templates\admin\page_change_form.html.py:20 #: .\templates\admin\page_index.html.py:29 msgid "Add" msgstr "Ajouter" -#: .\templates\admin\page_index.html.py:18 -#, python-format -msgid "Models available in the %(name)s application." -msgstr "Le modèle disponible dans l'application %(name)s." - -#: .\templates\admin\page_index.html.py:35 +#: .\templates\admin\index.html.py:35 .\templates\admin\page_index.html.py:35 msgid "Change" msgstr "modifié par" -#: .\templates\admin\page_index.html.py:45 +#: .\templates\admin\index.html.py:64 .\templates\admin\page_index.html.py:45 msgid "You don't have permission to edit anything." msgstr "Vous n'aver pas l'autorisation d'éditer quoi que ce soit." -#: .\templates\admin\page_index.html.py:53 +#: .\templates\admin\index.html.py:72 .\templates\admin\page_index.html.py:53 msgid "Recent Actions" msgstr "Actions récentes" -#: .\templates\admin\page_index.html.py:54 +#: .\templates\admin\index.html.py:73 .\templates\admin\page_index.html.py:54 msgid "My Actions" msgstr "Mes actions" -#: .\templates\admin\page_index.html.py:58 +#: .\templates\admin\index.html.py:77 .\templates\admin\page_index.html.py:58 msgid "None available" msgstr "Aucune disponible" -#: .\templates\admin\page_index.html.py:72 +#: .\templates\admin\index.html.py:91 .\templates\admin\page_index.html.py:72 msgid "Unknown content" msgstr "Contenu inconnu" +#: .\templates\admin\page_base.html.py:20 +#: .\templates\admin\page_index.html.py:11 +msgid "Pages" +msgstr "Pages" + #: .\templates\admin\page_login.html.py:8 msgid "Connexion" msgstr "Connexion" @@ -758,18 +759,9 @@ msgstr "Plateforme Ldt" #: .\templates\ldt\ldt_base.html.py:85 -msgid "link to admin" -msgstr "" - -#: .\templates\ldt\ldt_base.html.py:85 msgid "Staff" msgstr "admin" -#: .\templates\ldt\ldt_base.html.py:88 -#, fuzzy -msgid "profile change" -msgstr "Modification de l'adresse émail" - #: .\templates\ldt\ldt_base.html.py:107 msgid "home" msgstr "accueil" @@ -794,12 +786,8 @@ msgstr "Mon profil" #: .\templates\ldt\ldt_base.html.py:139 -msgid "version number" -msgstr "" - -#: .\templates\ldt\ldt_base.html.py:139 #, python-format -msgid " web %(WEB_VERSION)s | platform %(VERSION)s " +msgid " web %(WEB_VERSION)s | platform %(VERSION)s" msgstr "web v%(WEB_VERSION)s | platform v%(VERSION)s " #: .\templates\ldt\ldt_raw_base.html.py:13 @@ -885,7 +873,7 @@ msgid "The two emails didn't match." msgstr "les deux emails ne correspondent pas" -#: .\user\forms.py:82 +#: .\user\forms.py:82 .\user\templates\ldt\user\change_profile.html.py:44 msgid "First name" msgstr "Prénom" @@ -902,12 +890,12 @@ msgid "Your profile has been updated." msgstr "Votre nom a été modifié" -#: .\user\views.py:52 +#: .\user\views.py:54 #, fuzzy msgid "Your password has been updated." msgstr "Votre mot de passe a été changeé." -#: .\user\views.py:72 .\user\templates\registration\login.html.py:24 +#: .\user\views.py:74 .\user\templates\registration\login.html.py:24 msgid "Sorry, that's not a valid username or password." msgstr "Saisissez un nom d'utilisateur et un mot de passe valide." @@ -932,16 +920,19 @@ msgstr "Votre mot de passe a été changeé." #: .\user\templates\ldt\user\change_profile.html.py:33 -msgid "username" -msgstr "Nom d'utilisateur" +#, fuzzy +msgid "Username" +msgstr "Nom de utilisateur :" -#: .\user\templates\ldt\user\change_profile.html.py:44 -msgid "first name" -msgstr "Prénom" +#: .\user\templates\ldt\user\change_profile.html.py:52 +#, fuzzy +msgid "Name" +msgstr "Nom" #: .\user\templates\ldt\user\change_profile.html.py:60 -msgid "email" -msgstr "Adresse émail" +#, fuzzy +msgid "Email" +msgstr "E-mail" #: .\user\templates\ldt\user\change_profile.html.py:85 msgid "Profile change" @@ -1174,6 +1165,25 @@ "Nous vous avons envoyé par courriel les instructions pour activer le compte " "à l'adresse que vous avez indiquée. Vous devriez le recevoir rapidement." +#~ msgid "web" +#~ msgstr "web" + +#~ msgid "platform" +#~ msgstr "platform" + +#, fuzzy +#~ msgid "profile change" +#~ msgstr "Modification de l'adresse émail" + +#~ msgid "username" +#~ msgstr "Nom d'utilisateur" + +#~ msgid "first name" +#~ msgstr "Prénom" + +#~ msgid "email" +#~ msgstr "Adresse émail" + #, fuzzy #~ msgid "log out" #~ msgstr "Déconnexion" diff -r 64f24f8841ec -r caa1986245d7 src/ldt/ldt/templates/admin/index.html --- a/src/ldt/ldt/templates/admin/index.html Wed Sep 07 17:32:29 2011 +0200 +++ b/src/ldt/ldt/templates/admin/index.html Wed Sep 07 18:16:37 2011 +0200 @@ -11,7 +11,7 @@ {% block content %}
- +----------- {% if app_list %} {% for app in app_list %}
diff -r 64f24f8841ec -r caa1986245d7 src/ldt/ldt/templates/ldt/ldt_base.html --- a/src/ldt/ldt/templates/ldt/ldt_base.html Wed Sep 07 17:32:29 2011 +0200 +++ b/src/ldt/ldt/templates/ldt/ldt_base.html Wed Sep 07 18:16:37 2011 +0200 @@ -82,10 +82,10 @@
{% if user.is_staff %} - {% trans "Staff" %}| + {% trans "Staff" %}| {% endif %} {% if user.is_authenticated %} - {{user.email}}| {% trans "Log out" %} + {{user.username}}| {% trans "Log out" %} {% endif %}
{% endblock %} @@ -104,9 +104,9 @@ {% url ldt.user.views.profile as profile_url %} {% url ldt.ldt_utils.views.search_form as search_url %}