From: yomguy Date: Wed, 12 Dec 2012 08:38:01 +0000 (+0100) Subject: locale, fix null rank X-Git-Tag: 0.9-probarreau~264 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aae33994fd3c62cb74eaf4f629cdae195603b6a2;p=teleforma.git locale, fix null rank --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index fbf915ed..9582235a 100644 Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 42b64e04..70691086 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-10 23:10+0100\n" +"POT-Creation-Date: 2012-12-11 16:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" -"Language: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -460,7 +460,7 @@ msgstr "Page non trouvée" msgid "Server error" msgstr "Erreur du serveur" -#: templates/admin/base.html:21 templates/telemeta/base.html:100 +#: templates/admin/base.html:21 templates/telemeta/base.html:102 msgid "Home" msgstr "Accueil" @@ -488,7 +488,7 @@ msgstr "" msgid "Sent Messages" msgstr "Messages" -#: templates/postman/base.html:17 templates/telemeta/base.html:113 +#: templates/postman/base.html:17 templates/telemeta/base.html:115 msgid "Archives" msgstr "" @@ -727,15 +727,15 @@ msgstr "" msgid "Write" msgstr "" -#: templates/teleforma/answer_form.html:22 +#: templates/teleforma/answer_form.html:23 msgid "Answer to the following question" msgstr "Réalisez les consultations fictives suivantes" -#: templates/teleforma/answer_form.html:36 +#: templates/teleforma/answer_form.html:37 msgid "Save" msgstr "" -#: templates/teleforma/answer_form.html:40 +#: templates/teleforma/answer_form.html:41 msgid "Submit it" msgstr "Soumettre" @@ -927,8 +927,8 @@ msgstr "Nouvelle note" msgid "Status" msgstr "Status" -#: templates/teleforma/help.html:11 templates/telemeta/base.html:122 -#: templates/telemeta/base.html.py:135 +#: templates/teleforma/help.html:11 templates/telemeta/base.html:124 +#: templates/telemeta/base.html.py:137 msgid "Help" msgstr "Aide" @@ -941,10 +941,6 @@ msgstr "Informations" msgid "Progression" msgstr "Progression" -#: templates/teleforma/inc/answer_form.html:11 -msgid "Respond to the following question" -msgstr "Réalisez la consultation fictive suivante" - #: templates/teleforma/inc/conference_list.html:8 msgid "Live conferences" msgstr "Conférences en direct" @@ -992,52 +988,52 @@ msgstr "Durée" msgid "Answer to the following questions" msgstr "Réalisez les consultations fictives suivantes" -#: templates/telemeta/base.html:97 +#: templates/telemeta/base.html:99 msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:105 +#: templates/telemeta/base.html:107 msgid "Messaging" msgstr "Messagerie" -#: templates/telemeta/base.html:108 templates/telemeta/users.html:6 +#: templates/telemeta/base.html:110 templates/telemeta/users.html:6 #: templates/telemeta/users.html.py:69 msgid "Users" msgstr "" -#: templates/telemeta/base.html:115 templates/telemeta/search_criteria.html:69 +#: templates/telemeta/base.html:117 templates/telemeta/search_criteria.html:69 msgid "Search" msgstr "" -#: templates/telemeta/base.html:116 +#: templates/telemeta/base.html:118 msgid "Collections" msgstr "" -#: templates/telemeta/base.html:117 +#: templates/telemeta/base.html:119 msgid "Items" msgstr "" -#: templates/telemeta/base.html:120 +#: templates/telemeta/base.html:122 msgid "Admin" msgstr "" -#: templates/telemeta/base.html:132 +#: templates/telemeta/base.html:134 msgid "Profile" msgstr "Profil" -#: templates/telemeta/base.html:134 +#: templates/telemeta/base.html:136 msgid "Lists" msgstr "" -#: templates/telemeta/base.html:137 +#: templates/telemeta/base.html:139 msgid "Sign out" msgstr "" -#: templates/telemeta/base.html:179 +#: templates/telemeta/base.html:181 msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:189 +#: templates/telemeta/base.html:191 msgid "Legal notices" msgstr "" @@ -1275,6 +1271,9 @@ msgstr "" "Merci de vous connecter ou bien contactez l'administateur du site pour " "obtenir un accès privé." +#~ msgid "Respond to the following question" +#~ msgstr "Réalisez la consultation fictive suivante" + #~ msgid "Respond to the following questions" #~ msgstr "Réalisez les consultations fictives suivantes" diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index 14397d45..ebdb95d1 100644 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -147,7 +147,7 @@ class Question(models.Model): title = models.CharField(_('title'), max_length=255, blank=True) description = models.CharField(_('description'), max_length=1024, blank=True) question = tinymce.models.HTMLField(_('question'), blank=True) - rank = models.IntegerField(_('rank'), blank=True) + rank = models.IntegerField(_('rank'), blank=True, null=True) weight = models.IntegerField(_('weight'), choices=WEIGHT_CHOICES, default=1) min_nchar = models.IntegerField(_('minimum numbers of characters')) status = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2) diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html index 179764b1..d3328d5b 100644 --- a/teleforma/templates/teleforma/answer_form.html +++ b/teleforma/templates/teleforma/answer_form.html @@ -10,12 +10,10 @@ $(document).ready(function(){ new Messi(gettext('Sorry, it is not allowed to paste text here.'), {buttons: [{id: 0, label: gettext('Close'), val: 'X'}], modal: true}); }); }); - - - {% endblock extra_javascript %} + {% block course_content %}