From d6da137582ae026ef2f068f8e1d47667add7a47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sat, 15 Oct 2016 14:05:27 +0200 Subject: [PATCH] help texts, fix #27 --- locale/fr/LC_MESSAGES/django.mo | Bin 11325 -> 11614 bytes locale/fr/LC_MESSAGES/django.po | 66 ++++++++++-------- .../migrations/0020_auto_20161015_1201.py | 25 +++++++ proposals/models.py | 4 +- 4 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 proposals/migrations/0020_auto_20161015_1201.py diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 1e5f6fac928edf84f3e1bb13638a3ff2c7fac484..83337eb51c3fda1be7e3042c94da15d6d8f3e7cf 100644 GIT binary patch delta 4148 zcmZYBd2Ewq0LSr%4YrPJ92>_J_i}IUfK9F;ASm}G;KZpQ6zH}hYscDhIW3n?xfJG* zTjktf9Akpfh)M<#jnN?dDMX18f<$8s5ey#R-};mge8aDw=Xv_}ea?2AD!BYy_;S0Z zRfg+0d63jLGv+rO(t;PRTdj>r#@pz^#6)8fuoJe#ZrC3Cpx%E1JL5#u=L)eomZKh7 zVXZ_S88+`y$m5M8NZ;lf_QGGWHzv1rl@LS5eT6-$jjZzpWp^F4Rw854?by(Jj=< z#IoKp6*comu@8>GY+Q)x_#WoqSE&2$p!$npRMf*Jfr1(mQ3L2;>kmb4FgHF`oZ}_km^+l+?+lkuK z&#h-s9esuKo3JIQfed4x)Si#pqM67XOfj-sW~F_98#>hYAiH4BU|1u)L_z+BI&@9= z5zx{lV*&O+9hR4II96ECp$=yPKMLw78MT#J$T!vWLk(ygYUcT<`)8n5rZ|=T*9Tvs zfxb8JrrL-q3l zYJi1d3L42`)W|j|2$?;zlQocCh_Yr2J^51S70`d;!PdWAnI%!MXm5z z)bGkA>vh!Dg#WaKn4XalwnB}(Gsa>X>H(R^!8apOzksu_8TwI69zxx}5jCMI)C6kn z`=_yS0H}#xNBRkyTecydqpyyWQ8)BJb(D+E@Nv}Ajm31Ff_mUG)J!T+1Kfn{hB=HH z*te+9|AGVYchvLKdrS6zAcZ&@MxjpsMAQRjqn20gvUo1lx?m^9{7WIG+ZTqLF2YrG1^ZPAk;SJP- zQ&<)aEXz6xUDQi(C@#V=_yKAq?qE2VLcfP2BQ8R9P=e|>Wb5UaKz+5XZ?JB*?YmGN zRijp{4mFT3P+M{pwX!jsU~O>+)amb;!TM_n2hgBHGaA*=OnXBSY9LFn1%`15uEi;M z4j;$Pnfzx2XP};Q5M%H(>Un2Shw~fMq5RHzHIwz%gYVEFU96|}E(ujnL9IwH)X1}K z`%v3H4x7?G)z+tD6YBcL6qD$cPobLVoV-TH5pBgz?f=W9mdqx)_D3-9;L}7i8fn{h zqdpU~buFW=wGkR$1H8UK`rEdrFoS3UQ;GgIJVD$<&oXR}nV|yLE2I~Bo%A84MAuQ0 z*H|*g}ke?RwBAG+pB4s3cb*HdS{j>6Bn{9mrhmk^}eT`o8DI6xP z$adR!9JTa^i2eplB07A!{A3TQAU={!#u9C1H?p4S;5W|yF_=Z>5*JxXbXps~!?=u0 zBnQX_qCZrxlHMeG&7`oA@CWgK*ECw{$RLtVJVcicW{lSV4b|*bgNtps9GjD#q@`_p zA9HNEFYY2o$P)54(J!8U8=_Ylg}r1n*v^(9Q`tfxg~XD6mFHW3I;b${DRTm$ zIVIje!0Y#AIzex6fybHa_Bnpvf~C$J%EfM9k!PMWXQ>k`_Ber{yRb03etqIh7kB$h zy>kPNxBL9Td+&DN_vGyQpF4gW8{gl_$sOD`r~beLH=9f^Yp4!50e|Rj=k!efWgf@p zaY{X*pwnP+fwNr!DgMf_yq~-$MhAyY#++WY=#>I~4mLgf+Es delta 3864 zcmZA2c~F)`0LSs=d_fdR#Ka2}1VlW*1O-z(K*U?|NXQ#4OwB9r9`n8r#60u9&7;sv z8=K0qbc+748jTqm({h?jYs^WV(!Rg<*>|RC#~+{FectEUefHVsv1-_bp-xq;z)gm7 ziZmcQf{eMRdKiBw*TRj7!s{4<_b?P6Vs-SdX-p*6L>-UAXiPz!my6Y~2zANv)@jHk z9OF=7OtTgfunZIN1Jpn_@frLLgYhZy&jd%f$LpZ_V^ISoVhv0~{Vp48VLy9(3~C~i z(8Ks<4i#o%7Fsu;?qE08#`CB<`x@)uHPr9#p$2$@x?ni7)QZ$YO*oN1`dxbr#60w1 zZ`6bbVJhRBA}UF^7E|yn=Ho5Y(zasyIpMwi<0LI`|)E>Eyx=;kmqes`onuMBIOVk81tesJh zrl)NWMon~NZPuS_nPNKRY}8V&v2H~z@d5P5GpJ4VKCFQYLDzgoqqw_;YHK{f1}Rx zuwnG*B2nkn$2d$zZPGpt70s{+HDEDnC8nY-u+;XKqV8Z9YUz%k20mfir%?l(!zTCz zYJ$IF3I;vvj+2JEP8RBhog6BfVK3WJfDLIEVm!`9-O*0e${ewNhMK?)Y>BtA8P?%> zq+&Me_*B$DvuxY3?Ip;#j#+Ix%Ipue+x8yoVbo?jiH-4N)U&^dTDd<_OZg9K1;V&( zwd^)>qFq-I|3uAsb8ljOl^wD|4E6Q2kd> zkLD^eS5t*N1@q7zkKj4R(vC(J$7G@=I?!5--uHhd6)oK=)aKZR*|^{O6KXRi@R85} zX{cwKkGyfFKWZZ5P9y3q4vU9)Ic*(*ISO-17)c5_oCjebEpYkvR1@6ZpU|YWOJYjwFhEi z`RZW-zJP~NkI0W5sHKlbO{4{C!Wo!^xu^+DMh!F|Q$o6sjF>+i7mw zF`cPspuQM{BT!3MjLmQ&>Vlh5cd{Qf!IQ{hnJcJ?-N7IXN#Jo{IBLLLYXJt+9*z3K zzKo6a{?DhPCESG?=nQI!K0!UB3e*JeqF$dTsNY2-x&t=EVA^r0i6^5rV;V9ilY=}B zGXY!UI@BKe2&*x^xlBbD_{JWnL=Wv-$g6DbU<(Xohv~u@sEOrUOE84?O6-msQ7cf1 zX&A{eYGra!*X@NGuK*o&6jBMrF{t)L>kQjJA2q--)Jm;KP2eEvQCvbT=?&DTdVt#X zfywU5MWOaeQw+rpsN=cGtiNV5gbpqFaO{93*bfh37kr4lF^gA27g~Y-xEpoBeW*=& z9JLwWv0lP3+LhMZsFk>H+mD*F{<`C!6nEw|P$x7%^(SE;fwj~pcz%@*6K&GnHshn!q;qlE_&bpcq-Lx=Pqn*>#cAHd7I26r9`irzIMKn zNM$d{A=_-{dYnbFY}?06z6!oYQiyl`d;I6XE7bK4ZzSz)e=v3+uadzeo#@1UWC-a* zV#!dVFQm#0GKlOXWyDuvsEi@K3EvDoNw-XZK4b$~<93-77)CP5VUkbAk!<2Co2j%V z-N-^Rho}rA%gLK0ngozG8~+IZu>6;rg(2nB>%JG@X%m~;J~ORNd1`|Pe&tT1zp9m= IZgw=_UwuSP$N&HU diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c7e7dc0..2bc175c 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-13 19:23+0000\n" +"POT-Creation-Date: 2016-10-15 12:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" "Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de " "viande, etc." -#: accounts/models.py:18 proposals/templates/proposals/user_details.html:19 +#: accounts/models.py:18 proposals/templates/proposals/user_details.html:17 msgid "Biography" msgstr "Biographie" @@ -65,7 +65,7 @@ msgstr "Si différent de la ville de départ" msgid "Need accommodation?" msgstr "Besoin d'un hébergement ?" -#: accounts/models.py:73 proposals/templates/proposals/user_details.html:56 +#: accounts/models.py:73 proposals/templates/proposals/user_details.html:54 msgid "Constraints" msgstr "Contraintes" @@ -86,7 +86,7 @@ msgid "Video licence" msgstr "Licence vidéo" #: accounts/models.py:80 proposals/models.py:113 -#: proposals/templates/proposals/user_details.html:59 +#: proposals/templates/proposals/user_details.html:57 msgid "Notes" msgstr "Notes" @@ -340,7 +340,7 @@ msgstr "" #: ponyconf/templates/base.html:62 #: proposals/templates/proposals/talk_list.html:9 -#: proposals/templates/proposals/user_details.html:22 +#: proposals/templates/proposals/user_details.html:20 msgid "Talks" msgstr "Exposés" @@ -440,10 +440,18 @@ msgstr "Durée (min)" msgid "Title" msgstr "Titre" +#: proposals/models.py:107 +msgid "After submission, title can only be changed by the staff." +msgstr "Après soumission, le titre ne peut être modifié que par l’équipe d’organisation." + #: proposals/models.py:109 msgid "Abstract" msgstr "Résumé" +#: proposals/models.py:111 +msgid "The topics can not be changed after submission." +msgstr "Les thèmes ne peuvent pas être modifiés après soumission." + #: proposals/models.py:112 proposals/templates/proposals/talk_list.html:48 #: proposals/templates/proposals/track_form.html:14 msgid "Track" @@ -517,49 +525,49 @@ msgstr "Désolé, l’appel à participation est fermé." msgid "Show filtering options…" msgstr "Afficher les options de filtrage…" -#: proposals/templates/proposals/speaker_list.html:31 +#: proposals/templates/proposals/speaker_list.html:38 #: proposals/templates/proposals/talk_list.html:33 msgid "Filter" msgstr "Filtrer" -#: proposals/templates/proposals/speaker_list.html:39 +#: proposals/templates/proposals/speaker_list.html:46 msgid "Username" msgstr "Nom d’utilisateur" -#: proposals/templates/proposals/speaker_list.html:40 +#: proposals/templates/proposals/speaker_list.html:47 msgid "Fullname" msgstr "Prénom et nom" -#: proposals/templates/proposals/speaker_list.html:41 +#: proposals/templates/proposals/speaker_list.html:48 msgid "Talk count" msgstr "Nombre d’exposé" -#: proposals/templates/proposals/speaker_list.html:42 +#: proposals/templates/proposals/speaker_list.html:49 msgctxt "table column title" msgid "Need transport?" msgstr "Transport ?" -#: proposals/templates/proposals/speaker_list.html:43 +#: proposals/templates/proposals/speaker_list.html:50 msgctxt "table column title" msgid "Need accommodation?" msgstr "Hébergement ?" -#: proposals/templates/proposals/speaker_list.html:44 +#: proposals/templates/proposals/speaker_list.html:51 msgid "Need sound?" msgstr "Son ?" -#: proposals/templates/proposals/speaker_list.html:83 -#: proposals/templates/proposals/user_details.html:11 +#: proposals/templates/proposals/speaker_list.html:90 +#: proposals/templates/proposals/user_details.html:9 msgid "Contact" msgstr "Contacter" -#: proposals/templates/proposals/speaker_list.html:93 +#: proposals/templates/proposals/speaker_list.html:100 #: proposals/templates/proposals/talk_list.html:56 #: proposals/templates/proposals/talk_list.html:92 msgid "Total:" msgstr "Total :" -#: proposals/templates/proposals/speaker_list.html:93 +#: proposals/templates/proposals/speaker_list.html:100 msgid "speaker" msgstr "orateur" @@ -605,7 +613,7 @@ msgid "Decline the proposal" msgstr "Décliner la proposition" #: proposals/templates/proposals/talk_detail.html:12 -#: proposals/templates/proposals/user_details.html:14 +#: proposals/templates/proposals/user_details.html:12 msgid "Edit" msgstr "Éditer" @@ -743,51 +751,51 @@ msgstr "responsable" msgid "No tracks." msgstr "Aucune session." -#: proposals/templates/proposals/user_details.html:27 +#: proposals/templates/proposals/user_details.html:25 msgid "Preferences" msgstr "Préférences" -#: proposals/templates/proposals/user_details.html:31 +#: proposals/templates/proposals/user_details.html:29 msgid "Need transport:" msgstr "Défraiement du transport :" -#: proposals/templates/proposals/user_details.html:39 +#: proposals/templates/proposals/user_details.html:37 msgid "Accepted transport means:" msgstr "Moyens de transport souhaités :" -#: proposals/templates/proposals/user_details.html:40 +#: proposals/templates/proposals/user_details.html:38 msgid "Departure city:" msgstr "Ville de départ :" -#: proposals/templates/proposals/user_details.html:42 +#: proposals/templates/proposals/user_details.html:40 msgid "Return city:" msgstr "Ville de retour :" -#: proposals/templates/proposals/user_details.html:44 +#: proposals/templates/proposals/user_details.html:42 msgid "Transport booked:" msgstr "Transport réservé :" -#: proposals/templates/proposals/user_details.html:48 +#: proposals/templates/proposals/user_details.html:46 msgid "Need accommodation:" msgstr "Besoin d'hébergement :" -#: proposals/templates/proposals/user_details.html:49 +#: proposals/templates/proposals/user_details.html:47 msgid "Accommodation booked:" msgstr "Hébergement réservé :" -#: proposals/templates/proposals/user_details.html:50 +#: proposals/templates/proposals/user_details.html:48 msgid "Video output:" msgstr "Sortie vidéo :" -#: proposals/templates/proposals/user_details.html:51 +#: proposals/templates/proposals/user_details.html:49 msgid "Need sound:" msgstr "Besoin de son :" -#: proposals/templates/proposals/user_details.html:52 +#: proposals/templates/proposals/user_details.html:50 msgid "Ok to be recorded on video:" msgstr "Accepte d’être enregistré en vidéo :" -#: proposals/templates/proposals/user_details.html:53 +#: proposals/templates/proposals/user_details.html:51 msgid "Video licence:" msgstr "Licence vidéo :" diff --git a/proposals/migrations/0020_auto_20161015_1201.py b/proposals/migrations/0020_auto_20161015_1201.py new file mode 100644 index 0000000..064a5a3 --- /dev/null +++ b/proposals/migrations/0020_auto_20161015_1201.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-15 12:01 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0019_auto_20161011_1720'), + ] + + operations = [ + migrations.AlterField( + model_name='talk', + name='title', + field=models.CharField(help_text='After submission, title can only be changed by the staff.', max_length=128, verbose_name='Title'), + ), + migrations.AlterField( + model_name='talk', + name='topics', + field=models.ManyToManyField(blank=True, help_text='The topics can not be changed after submission.', to='proposals.Topic', verbose_name='Topics'), + ), + ] diff --git a/proposals/models.py b/proposals/models.py index b8f62e9..5967e88 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -104,11 +104,11 @@ class Talk(PonyConfModel): proposer = models.ForeignKey(User, related_name='+') speakers = models.ManyToManyField(User, verbose_name=_('Speakers')) - title = models.CharField(max_length=128, verbose_name=_('Title')) + title = models.CharField(max_length=128, verbose_name=_('Title'), help_text=_('After submission, title can only be changed by the staff.')) slug = AutoSlugField(populate_from='title', unique=True) abstract = models.CharField(max_length=255, blank=True, verbose_name=_('Abstract')) description = models.TextField(blank=True, verbose_name=_('Description')) - topics = models.ManyToManyField(Topic, blank=True, verbose_name=_('Topics')) + topics = models.ManyToManyField(Topic, blank=True, verbose_name=_('Topics'), help_text=_('The topics can not be changed after submission.')) track = models.ForeignKey(Track, blank=True, null=True, verbose_name=_('Track')) notes = models.TextField(blank=True, verbose_name=_('Notes')) event = models.ForeignKey(Event, verbose_name=_('Intervention kind'))