From aae33994fd3c62cb74eaf4f629cdae195603b6a2 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 12 Dec 2012 09:38:01 +0100 Subject: [PATCH] locale, fix null rank --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 9130 -> 9037 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 49 +++++++++--------- teleforma/models/pro.py | 2 +- .../templates/teleforma/answer_form.html | 4 +- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index fbf915edaaca07da61a033964f38235dbd05a9dc..9582235a18cae9e67679933c5992d078c3f39249 100644 GIT binary patch delta 3977 zcmYk83y_yp8HW$DE(p7b%SDzIb{EmO1ac85E}?@inzD{UAc#PMpvFZ-*Sz4jct;VC z1w#-}gGA(_EkY1cnpv8HLqpTx#8i@(!JTO)oeE2Pp8xmm3}^WLpYxvYocD6h`MzcA z*!OC(V`W9F6Kx+l2Yq&WN?*eLZTX>XIWwg;@FjQ#+yzI%12O(3bZT+?lsdpN*b1Hx zOJRRl3`fE$I0jb3S&(^IdV~%!(=uqFRj>qZghg;$jK2zXydUcLO=#f5F@6jh=%cWk zU~B9zpnkrB`fqtwzP=r7OZ;>W9VhgHR@e`^a2PbPi^8sfEwQf(dpy+PRLCZzInV^} z3Ofrfhx*wFjk6h=_*QM=r`>dP{BvmKzl0|6t`p!9Nb>0@wDJ@2{6ArzR+i6i58Z)s zXdzX>KF~xjg!&x~+ri6VW+s#3!Ay7>_FU-r0%%3|#`6cE3ztIvrFHytggavV*U$tH zLlgfC><<49FNZ~35dGFd{Z8q?{+sCy49L0hpe`of53T5NXy#8rFX>uH@o5iqXWoXc zKMI|9JnSZDBL9L0{BN*`tljC7j_kh`mB&CY=)@t=GaCg>U<`ELccFnM2WLVnng{up z?&ha(nW2fSg3ezL_4^_;p`G!3R~7@mfI4~udKV7DN$@b#VV_QUA_HJ&>|xL|t%W+A z3=J?18hCa*UjW(tbPsgilhA@zLgQu6&~f4B;C86v*Pv(lD`@2hWBkw1g`b4|dGKrK z{5E7~0$rd1tApo53+oFl=z^SC8bU{hBcNL~7J3P<&L^Y^F+K%$V|*6W@dMCG9)+%7 z23@x{#@9m&+XQ_*w?WT*e>{I1miqp`Pe+HxpqYILP2|(yKcSBP2fb{kpPfJN46U>Z zy1sX?KXm@!cs?TROP~o~3H3i7w)g$NJ|@hM2X)XbuZIR$4oz%LjBkKkCD3pCO6Zmzf^OLdkmF6CKr8zSnqYC) zd|fBlAG>>ST#Vlb4g4^4{!*yFbYMk+-0U9)t$?LyZ3w>i1J<pv(TN|0iD+fJ%R&pI(!2bXLNd0qdr$}OLksv5w15-PO8*V5utkr22RjEVpoLWh`}Sb}4K$R2!UqECxEAVY zBJ>ERLo1yHb#Mzbu{)vj7eoClfmXT#n!wtycS6_gg&x_P&~<;z=;-(uG=byLgSLc0+ko3swuZbu%v%`cd34;q9P zqFd2($hHQ31C8KI`uox|#_gbg6Z#&qU4d4jJJB@cU8zF%pyt*<=R&jqeW!U4{-~k4 zT}5^my}hU&+18^~gE2yI5T-e@s;QiFDF zjx24>JB8m-(O&@{MZLm47hZ{mqPFNIWP2XXMR%il=+t%tMjtdCZ9=tZG8%`TQLBMf1BVVDJg{+Dm+{4oC6ybB{tty1Q*HnN delta 4043 zcmYk74|La68Hew5xYjn9Y)rSsHWo_If(-&}0@aBeiiSY~DgOq{IT{d^PuZXU>5s_ia6m4XoM4?3u~Z`T_4*s;f1v4$Mzzq!A3|j!b+%v z_r&(b$emC-2cQ8RhC2R)ZT1h(Qqk~p(8y0i9eBkF@J&cC;cckr=i+$gz*Ku6bbc8$ z1H++#R7O@q9i0rFHx2fOvtgnq^>LsDUO>AY+MhrpS|7(dp$m6F{z4Z&`S7XO{{qy( zH=vIH9hSfk;ngso3!>e5P`gX=$iJR0r$e^KfsQzF12m%TP|tTmFX?_r62b{+W?q7> ze;aza&O+xG;GO-YP=|&?Hy#-|E}#6H@=0_U*;Huz#yFuKdUnlFM^-@RwL=ZBkK6){ zY$xO|bn)Z5r=gBK3!Q%&>cC4-hh9(OgtubH`%pt?p?4w-3SkyVhZ>v%bz~tdfDO>I zT>~|^9=gFM=*HXP_-@E4gh!zBeg(CY9H-)j&p{XdG4eI2;lDu7^dHd3-PQg9&~-(z zeR*URbp8aW1J^(|oDn%28rWP&KuM@gRYE<~;8JL+Zi8ONyW@CA?7tTdrhhBc@F8d< zN1^MVhORpq`%gmydlCAXo`D|md%feF|2Zmpe8D9tgSpUD4}v;U9C;bk&?xAo8z1|p zKqH+Fb?BzZ1~zlr_NLoRxF zEslQxb>P3yd1;rX+8I!L+0cy(pm$*~OzukKp`hXh2Mbf|fxhv_p(#x(N~J6Zat%Te zG_p#lgI7S;*T9kR`p6{qKMLLWap?S~phs}3i1XLem+5e$KSjP1Cw>$sW)!C)$%k%K z2#u&bwkzWJSg7G@$OjZ^pmyg#9k>OW>1ODWuPG+~8rl#iY=hp;ozR7QA`d_xoF1qH zr(*j>=%xBAG$S8DkHA;T4f;X*^PqN%p$?Wp9jZuTWensVhHB`-uR~5H%!h8U3hL-O zsKL$9&v1L}e+atnKy3dKnt>D0^{>S7cc6~^2YM9A$5b?!!#CvygP@U?LXJOFK^>V2 zeOebo4R=5zy&n#RyWj%&YiQ;!=ixWP(NIUf5IH&aPlL=$!b~bUun?NsB@mxN3*;h) zO;AVnL9!d3fg|7L^~q)LBE1Su=jI>&U+pj>B~?D-h{4u7rNoUp&836OU=uL7bbKRQ<)D-p^hZb zOmsj~y%Bm=d!Yupp@xq@9X%e~zk_b{D%7#}p>{rm-ujQBjt<})?JtCh2Fj_p(I{xD zCPVvYK{r|qjci%u9Z-WEar{1L#CxC{cR?@NW3hc08dwi>-7`=}UKm3Do%kvp8hAYp z{0({sK7fwrmZuElLmeuHzVX8%M?lwq4jRB%XaG~7k=_6ea2_;+Es?9r$-j}^Nrzkq z^|TY}>2|2$E~ueysDUS;ksgDtI{|g<_t5!gpmyGZM*1$)fq%tz_NP)q8@dk-H_hjl zc{J`sQ_wE75&ax}w=*sKl0vWRWyn&Ge$iVaFP&A{#mSFpjYQu=OVB>_9pu;IBlIX* zjwU0WKa4E*q|ke0W?9D^%fOi+09#JM=Nz zj>gA6vv1j(LhtYVSl`q+IHxq}p;e3O(8@T%Kc?QYo?qW>Z{4@hz33LS8a<9m&<dIPHG_=(=wbpfal{}dKf1WRBmjD0& 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 %}
-- 2.39.5