From 89e5260027ae4c8b13e497af37c82f8215843db3 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 28 Jan 2021 01:04:10 +0100 Subject: [PATCH] Fin de la traduction --- fiches/forms.py | 10 +-- fiches/models.py | 6 +- fiches/templates/fiches/base.html | 2 +- fiches/templates/fiches/fiches_modif.html | 32 +++------ fiches/templates/fiches/home.html | 2 +- locale/en/LC_MESSAGES/django.mo | Bin 4447 -> 4648 bytes locale/en/LC_MESSAGES/django.po | 75 ++++++++++++++-------- 7 files changed, 66 insertions(+), 61 deletions(-) diff --git a/fiches/forms.py b/fiches/forms.py index ffd7b3b..b8f9782 100644 --- a/fiches/forms.py +++ b/fiches/forms.py @@ -1,6 +1,8 @@ from django import forms from django.forms.models import inlineformset_factory -from fiches.models import Profile, Department, Phone, Social, Mail, Address +from django.utils.translation import gettext_lazy as _ + +from fiches.models import Address, Department, Mail, Phone, Profile, Social class ProfileForm(forms.ModelForm): @@ -10,8 +12,8 @@ class ProfileForm(forms.ModelForm): class SearchForm(forms.Form): - name = forms.CharField(label="Nom/Surnom", max_length=1023, required=False) - year = forms.IntegerField(label="Promotion", required=False) + name = forms.CharField(label=_("Nom/Surnom"), max_length=1023, required=False) + year = forms.IntegerField(label=_("Promotion"), required=False) department = forms.ModelMultipleChoiceField( queryset=Department.objects.all(), required=False ) @@ -23,7 +25,7 @@ class SearchForm(forms.Form): and not cleaned_data["year"] and not cleaned_data["department"] ): - raise forms.ValidationError(("Tous les champs sont vides"), code="invalid") + raise forms.ValidationError(_("Tous les champs sont vides"), code="invalid") PhoneFormSet = inlineformset_factory(Profile, Phone, exclude=[]) diff --git a/fiches/models.py b/fiches/models.py index 8c7111a..90c8427 100644 --- a/fiches/models.py +++ b/fiches/models.py @@ -1,7 +1,7 @@ -from django.db import models -from django.core.validators import MinValueValidator -from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User +from django.core.validators import MinValueValidator +from django.db import models +from django.utils.translation import gettext_lazy as _ class Profile(models.Model): diff --git a/fiches/templates/fiches/base.html b/fiches/templates/fiches/base.html index 9ecc5f6..8d1eecb 100644 --- a/fiches/templates/fiches/base.html +++ b/fiches/templates/fiches/base.html @@ -27,7 +27,7 @@
{% csrf_token %} - +
diff --git a/fiches/templates/fiches/fiches_modif.html b/fiches/templates/fiches/fiches_modif.html index 71609cc..8d77c9c 100644 --- a/fiches/templates/fiches/fiches_modif.html +++ b/fiches/templates/fiches/fiches_modif.html @@ -63,39 +63,23 @@ {{ form.thurne }} -
- +
+ {% trans "Ajouter un numéro" as add_number %} {% include "fiches/multientry.html" with formset=phone_form new_entry_text=add_number %}
-
+
{% trans "Ajouter un réseau social" as add_social %} {% include "fiches/multientry.html" with formset=social_form new_entry_text=add_social %}
-
- +
+ {% trans "Ajouter un email" as add_mail %} {% include "fiches/multientry.html" with formset=mail_form new_entry_text=add_mail %}
-
- +
+ {% trans "Ajouter une adresse" as add_address %} {% include "fiches/multientry.html" with formset=address_form new_entry_text=add_address %}
@@ -120,5 +104,5 @@ {% endblock %} {% block extra_js %} - + {% endblock %} diff --git a/fiches/templates/fiches/home.html b/fiches/templates/fiches/home.html index f6648c5..bd2af5a 100644 --- a/fiches/templates/fiches/home.html +++ b/fiches/templates/fiches/home.html @@ -14,7 +14,7 @@ {{ form.year }} - + {{ form.department }} diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 92899caebd9b3d5e76223cfff13c36b1f047491b..87744424bc6a5be1968c0fb044becf04d0f3fdbe 100644 GIT binary patch delta 1966 zcmcbwv_hr+o)F7a1_lO(AO;2o83qQ1HB1Z)xeN>pHmo2~28Iu83=CWh3=ALH7#MgM z7#RMrF)*+*FfeekL->O13=9Gc3=DEmTA!VPL5P8Y!GWEDL6U)iA()+kL70JoA(x$j zftP`Sp^=?|L5zWcp`V?BL5_i;o?#g~1A{UH1H(~v1_m|;28NgH3=G^13=AKj8vd{| zFsL#xFmQ1&FjzA%Fc@$!Fvv16Fyuh#E)IypS8y;e=z`4QU|l`w|VRy+(0EDQ_`jyw<-yYVnExG*v>1o1#DoX!hz_#$42y7f^07G8)05As6d z`Z6yhq#p7zFo-ZPFnr;KL;)vXJtS@<_#g_D_#h53uBPVv(2t#3B^|h(*Q%kThfm755i_ zL}h)P0K|uB0+680g=(l0fHq%HJaZ39-XaiylG6KSM40B>)L& zCP9eDcm%=r)-wnSLgGY15aIw`L5Rz&APN|q1R*~26ogpdF9`8bo*=~Ml~DClpyG3& z^m0Lng_{H+iEX=Rpay+{8t@BBvkF0?KtKrMa!DvH2c?yT z7#J8C7#Q>!7#I{77#NJ9rKvdsB%6ZDQ9lMq4g#eGP~ip=Q(|CX5CP?XTLuOO9R`Rc zjtr1^0x1AtP|*pZH5efA4Pt`|BRNn>#sG<9F9rq%e+CAIK#(K@0|OJ3Hf3O72w-4f zFk^ruYEUr_m13}DfRv{7CNL2w4JwM=p==PP#{emQK}9R5SoH;!{h;!lfq_92qyUOR zMYl5p1A`T)Kx1HFaAJT&j|T$-g9TI#i1KD&U~pw%V6bBVmo@baHVlyX1xbP`1`rLZ zXxtbe=>WtBWid|%1_nb01_muqc4A;)P-kFZP+@>%TOS4n21N!)g#%LW!T`wyAU3EZ z1yyXIas?IG6_PU&a|? z);2ISFqpiW$91w4&!o*Cc-WbE7+g|8M(3vHl~_$?=ASaTlRt6teSU4Wz|zd*Y=z0p j0tw;@Rt%0gISOf+sW~ad3W-Ij3aPmTC6$wt1^xg4U-Gp8 delta 1823 zcmZ3Xa$l+bo)F7a1_lNOKL!Q{83qQ19wr8cYz78~KP(_o28I=E3=CWh3=AvT7#MgM z7#Oy&F)*+*FfbfsV_@KBU|=}O#=s!Jz`$@7Np0hJB$TBc6D04t)M-GU?<2e`@bV25DFfa%*Ffgp*fLOeT1LE)t zQ2H(h0|Ore1H&s01_mjHdIpA{91sgdI2jl?7#J87ptL3@#OFqw3=Gl?3=FoM5Q`!? z85md@7#PYpAqLlQLPDSus%{o1!~xql85lSj7#L1)LPG2kC&c1goDln7axyT8)-y0L zeC1?d5NBXu;O2s8Q09VItjoo~AP)*ME=Z6@a6v50=3-#rXJBBc;DR`~g9{RJ6QTSW zTo4NuazQL!3)Q!ki-Ccefq~%=7bL`waWOE|gW~WN7bGaZK{beQLwq2^4Y5#<8{!~q zZb*>2aYGD>g7V|IAr=*JLqevC8{(h_Zit84xfvKl85kHQLdBOu>2=%;^$ehNwv`*= z;$7Sf3@(fe49B1ra`QqQAjZo8R;LW*Yw$uGXvzyoRPMZx5DMjGU=U$oV94Nw1a&Ph z!~s1}`DwfmhpglUCq9P#y!8;5-s6S%@F_3EAs=`lLG*{0fx!rrCip;!g@GX$O6Ni8 zPCf<(Z3YI0C43NvT;PLPe2))e&Raf+xj&(N7Jf)n3-Cicq*2cgi9=m}h(a@dhyjlL z3=9$s3=9GM5Q{VUAwk;$mG6S8pUDqNd`qC>TlpbTafBb@u`~RT5WLI}anJ*(zBf>Q z{dcHBW&wx>E&)i;2ns+9Hh_vd3P23@5P$?}fB?h?QBXQw0Af)JR9zudU!?%V;SEr8 z+XNsUT`B9@L_j0+2-a8EO%`ASCtk2tphzBM7lTSrFntO+knS zhEUo@5E8=ff)ED>KOiegPr;l;qfV8_6~U<_3UD(XQ@1rPzsT%i1K$iTqh%D}+D z1S)13AjK_6-h}~D=1YM%P%Jk2Et}qE8TNmSoT&wgMJ2hZc_ov@IOQihbDB@C<_w#B zhcjn#5SPp3\n" +"Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Tom Hubrecht \n" -"Language-Team: \n" "X-Generator: Poedit 2.4.1\n" +#: fiches/forms.py:15 +msgid "Nom/Surnom" +msgstr "Name/Nickname" + +#: fiches/forms.py:16 +msgid "Promotion" +msgstr "Entry year" + +#: fiches/forms.py:28 +msgid "Tous les champs sont vides" +msgstr "All fields are empty" + #: fiches/models.py:11 msgid "utilisateur" msgstr "user" @@ -100,6 +112,10 @@ msgstr "address" msgid "Annuaire des élèves de l'ENS" msgstr "ENS student directory" +#: fiches/templates/fiches/base.html:30 +msgid "Recherche Rapide" +msgstr "Quick Search" + #: fiches/templates/fiches/base.html:31 msgid "Rechercher" msgstr "Search" @@ -232,85 +248,85 @@ msgstr "Date of birth:" #: fiches/templates/fiches/fiches_modif.html:63 msgid "Thurne :" -msgstr "Room" +msgstr "Room :" -#: fiches/templates/fiches/fiches_modif.html:68 +#: fiches/templates/fiches/fiches_modif.html:66 msgid "Personnel" msgstr "Private" -#: fiches/templates/fiches/fiches_modif.html:69 +#: fiches/templates/fiches/fiches_modif.html:66 msgid "0612345678" msgstr "0612345678" -#: fiches/templates/fiches/fiches_modif.html:71 +#: fiches/templates/fiches/fiches_modif.html:67 msgid "Numéro(s) de téléphone :" msgstr "Phone number(s):" -#: fiches/templates/fiches/fiches_modif.html:72 +#: fiches/templates/fiches/fiches_modif.html:68 msgid "Ajouter un numéro" msgstr "Add a phone number" -#: fiches/templates/fiches/fiches_modif.html:77 +#: fiches/templates/fiches/fiches_modif.html:71 msgid "InstaTok" msgstr "InstaTok" -#: fiches/templates/fiches/fiches_modif.html:78 +#: fiches/templates/fiches/fiches_modif.html:71 msgid "mon_profil_instatok" msgstr "my_instatok_profile" -#: fiches/templates/fiches/fiches_modif.html:80 +#: fiches/templates/fiches/fiches_modif.html:72 msgid "Réseaux sociaux :" msgstr "Social networks:" -#: fiches/templates/fiches/fiches_modif.html:81 +#: fiches/templates/fiches/fiches_modif.html:73 msgid "Ajouter un réseau social" msgstr "Add a social network" -#: fiches/templates/fiches/fiches_modif.html:86 +#: fiches/templates/fiches/fiches_modif.html:76 msgid "Professionelle" msgstr "Professional" -#: fiches/templates/fiches/fiches_modif.html:87 +#: fiches/templates/fiches/fiches_modif.html:76 msgid "moi@ens.fr" msgstr "me@ens.fr" -#: fiches/templates/fiches/fiches_modif.html:89 -msgid "Mail(s):" +#: fiches/templates/fiches/fiches_modif.html:77 +msgid "Mail(s) :" msgstr "E-mail(s):" -#: fiches/templates/fiches/fiches_modif.html:90 +#: fiches/templates/fiches/fiches_modif.html:78 msgid "Ajouter un email" msgstr "Add an e-mail" -#: fiches/templates/fiches/fiches_modif.html:95 +#: fiches/templates/fiches/fiches_modif.html:81 msgid "Bureau" msgstr "Office" -#: fiches/templates/fiches/fiches_modif.html:96 +#: fiches/templates/fiches/fiches_modif.html:81 msgid "45 rue d'Ulm" msgstr "45 rue d'Ulm" -#: fiches/templates/fiches/fiches_modif.html:98 -msgid "Adresse(s):" +#: fiches/templates/fiches/fiches_modif.html:82 +msgid "Adresse(s) :" msgstr "Address(es):" -#: fiches/templates/fiches/fiches_modif.html:99 +#: fiches/templates/fiches/fiches_modif.html:83 msgid "Ajouter une adresse" msgstr "Add an address" -#: fiches/templates/fiches/fiches_modif.html:103 +#: fiches/templates/fiches/fiches_modif.html:87 msgid "Champ libre :" msgstr "Free space:" -#: fiches/templates/fiches/fiches_modif.html:109 +#: fiches/templates/fiches/fiches_modif.html:93 msgid "Apparaître sur l'annuaire papier ?" msgstr "Appear on the paper directory?" -#: fiches/templates/fiches/fiches_modif.html:113 +#: fiches/templates/fiches/fiches_modif.html:97 msgid "Conserver la fiche annuaire ?" msgstr "Keep the directory record?" -#: fiches/templates/fiches/fiches_modif.html:116 +#: fiches/templates/fiches/fiches_modif.html:100 msgid "Enregistrer" msgstr "Save" @@ -323,9 +339,12 @@ msgid "Nom/Surnom :" msgstr "Name/Nickname:" #: fiches/templates/fiches/home.html:17 -msgid "Department :" +msgid "Départment :" msgstr "Department:" #: fiches/templates/fiches/home.html:19 msgid "Recherche" msgstr "Search" + +#~ msgid "Department :" +#~ msgstr "Department:"