locales

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 691fe74ad7258ba25736061b63ad6a10f429db80..fd978ced30fcef526f2fdf52ba21e99e7b82e671 100644 (file)
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 49c36940077179526cc8460e304eec61a4fe8f2f..4202904400c04909f67007bc7807a852e79de519 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-12 21:35+0200\n"
+"POT-Creation-Date: 2013-12-06 21:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: models/ae.py:46 models/core.py:205 models/crfpa.py:108 models/crfpa.py:146
-#: models/pro.py:159 models/pro.py:211 models/pro.py:255 models/pro.py:302
+#: models/pro.py:158 models/pro.py:210 models/pro.py:254 models/pro.py:301
 msgid "user"
 msgstr "utilisateur"
 
@@ -26,7 +26,7 @@ msgstr "utilisateur"
 msgid "period"
 msgstr "période"
 
-#: models/ae.py:49 models/crfpa.py:114 models/pro.py:263
+#: models/ae.py:49 models/crfpa.py:114 models/pro.py:262
 msgid "platform only"
 msgstr "plateforme seulement"
 
@@ -64,17 +64,17 @@ msgstr "Madame"
 
 #: models/core.py:97 models/core.py:109 models/core.py:132 models/core.py:144
 #: models/core.py:189 models/core.py:226 models/core.py:330 models/crfpa.py:47
-#: models/crfpa.py:63 models/pro.py:49
+#: models/crfpa.py:63 models/pro.py:48
 msgid "name"
 msgstr "nom"
 
 #: models/core.py:98 models/core.py:110 models/core.py:133 models/core.py:145
 #: models/core.py:160 models/core.py:227 models/core.py:245 models/core.py:311
-#: models/core.py:331 models/crfpa.py:48 models/pro.py:141 models/pro.py:194
+#: models/core.py:331 models/crfpa.py:48 models/pro.py:140 models/pro.py:193
 msgid "description"
 msgstr "description"
 
-#: models/core.py:105 models/core.py:112 models/core.py:225 models/pro.py:193
+#: models/core.py:105 models/core.py:112 models/core.py:225 models/pro.py:192
 msgid "organization"
 msgstr "organisation"
 
@@ -98,8 +98,8 @@ msgstr "département"
 msgid "course type"
 msgstr "type de matière"
 
-#: models/core.py:159 models/core.py:209 models/core.py:310 models/pro.py:140
-#: models/pro.py:219
+#: models/core.py:159 models/core.py:209 models/core.py:310 models/pro.py:139
+#: models/pro.py:218
 msgid "title"
 msgstr "titre"
 
@@ -107,13 +107,13 @@ msgstr "titre"
 msgid "code"
 msgstr "cote"
 
-#: models/core.py:162 models/core.py:314 models/pro.py:102 models/pro.py:218
-#: models/pro.py:304
+#: models/core.py:162 models/core.py:314 models/pro.py:101 models/pro.py:217
+#: models/pro.py:303
 msgid "date modified"
 msgstr "date de modification"
 
-#: models/core.py:163 models/core.py:358 models/core.py:419 models/pro.py:70
-#: models/pro.py:143
+#: models/core.py:163 models/core.py:358 models/core.py:419 models/pro.py:69
+#: models/pro.py:142
 msgid "rank"
 msgstr "rang"
 
@@ -125,7 +125,7 @@ msgstr "note de synthèse"
 msgid "obligations"
 msgstr "obligations"
 
-#: models/core.py:166 models/crfpa.py:91 models/pro.py:71
+#: models/core.py:166 models/crfpa.py:91 models/pro.py:70
 msgid "magistral"
 msgstr "magistral"
 
@@ -134,7 +134,7 @@ msgid "types"
 msgstr "types"
 
 #: models/core.py:182 models/core.py:347 models/core.py:410 models/core.py:471
-#: models/pro.py:65 templates/teleforma/inc/seminar_description.html:9
+#: models/pro.py:64 templates/teleforma/inc/seminar_description.html:9
 msgid "course"
 msgstr "matière"
 
@@ -142,7 +142,7 @@ msgstr "matière"
 msgid "domain"
 msgstr "domaine"
 
-#: models/core.py:220 models/core.py:474 models/pro.py:76
+#: models/core.py:220 models/core.py:474 models/pro.py:75
 msgid "professor"
 msgstr "intervenant"
 
@@ -158,7 +158,7 @@ msgstr "hôte"
 msgid "port"
 msgstr "port"
 
-#: models/core.py:244 models/core.py:355 models/core.py:418 models/pro.py:63
+#: models/core.py:244 models/core.py:355 models/core.py:418 models/pro.py:62
 msgid "type"
 msgstr "type"
 
@@ -175,7 +175,7 @@ msgid "streaming server"
 msgstr "serveur de diffusion"
 
 #: models/core.py:262 models/core.py:351 models/core.py:408 models/core.py:579
-#: models/pro.py:98
+#: models/pro.py:97
 msgid "conference"
 msgstr "conférence"
 
@@ -195,8 +195,8 @@ msgstr "stream en direct"
 msgid "credits"
 msgstr "crédits"
 
-#: models/core.py:313 models/pro.py:101 models/pro.py:167 models/pro.py:217
-#: models/pro.py:303
+#: models/core.py:313 models/pro.py:100 models/pro.py:166 models/pro.py:216
+#: models/pro.py:302
 msgid "date added"
 msgstr "date d'ajout"
 
@@ -208,7 +208,7 @@ msgstr "publié"
 msgid "mime type"
 msgstr "Type mime"
 
-#: models/core.py:318 models/pro.py:144
+#: models/core.py:318 models/pro.py:143
 msgid "weight"
 msgstr "poids"
 
@@ -224,7 +224,7 @@ msgstr "type de document"
 msgid "annal"
 msgstr "annale"
 
-#: models/core.py:359 models/pro.py:215
+#: models/core.py:359 models/pro.py:214
 msgid "file"
 msgstr "fichier"
 
@@ -232,7 +232,7 @@ msgstr "fichier"
 msgid "readers"
 msgstr ""
 
-#: models/core.py:465 models/pro.py:66
+#: models/core.py:465 models/pro.py:65
 #: templates/teleforma/inc/seminar_description.html:7
 msgid "sub title"
 msgstr "sous-titre"
@@ -245,11 +245,11 @@ msgstr "id public"
 msgid "session"
 msgstr "session"
 
-#: models/core.py:478 models/pro.py:67
+#: models/core.py:478 models/pro.py:66
 msgid "public concerned"
 msgstr "public concerné"
 
-#: models/core.py:479 models/pro.py:68
+#: models/core.py:479 models/pro.py:67
 #: templates/teleforma/inc/seminar_description.html:11
 msgid "level"
 msgstr "niveau"
@@ -274,19 +274,19 @@ msgstr "date de début"
 msgid "end date"
 msgstr "date de fin"
 
-#: models/core.py:487 models/pro.py:74
+#: models/core.py:487 models/pro.py:73
 msgid "approximative duration"
 msgstr "durée approximative"
 
-#: models/core.py:488 models/pro.py:69
+#: models/core.py:488 models/pro.py:68
 msgid "price"
 msgstr "prix"
 
-#: models/core.py:489 models/pro.py:72
+#: models/core.py:489 models/pro.py:71
 msgid "approved"
 msgstr "homologué"
 
-#: models/core.py:493 models/pro.py:78
+#: models/core.py:493 models/pro.py:77
 msgid "description documents"
 msgstr "documents de description"
 
@@ -337,40 +337,40 @@ msgstr "iej"
 msgid "student"
 msgstr "étudiant"
 
-#: models/crfpa.py:147 models/pro.py:267
+#: models/crfpa.py:147 models/pro.py:266
 #: templates/teleforma/seminar_testimonial.html:36
 #: templates/teleforma/seminar_testimonial_knowledge.html:36
 #: templates/telemeta/profile_detail.html:80
 msgid "Address"
 msgstr "Adresse"
 
-#: models/crfpa.py:148 models/pro.py:268
+#: models/crfpa.py:148 models/pro.py:267
 msgid "Postal code"
 msgstr "Code postal"
 
-#: models/crfpa.py:149 models/pro.py:269
+#: models/crfpa.py:149 models/pro.py:268
 msgid "City"
 msgstr "Ville"
 
-#: models/crfpa.py:150 models/pro.py:270
+#: models/crfpa.py:150 models/pro.py:269
 msgid "Country"
 msgstr "Pays"
 
-#: models/crfpa.py:151 models/pro.py:271
+#: models/crfpa.py:151 models/pro.py:270
 #: templates/telemeta/profile_detail.html:89
 msgid "Language"
 msgstr "Langue"
 
-#: models/crfpa.py:152 models/pro.py:272 templates/postman/base.html:11
+#: models/crfpa.py:152 models/pro.py:271 templates/postman/base.html:11
 #: templates/telemeta/profile_detail.html:81
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models/crfpa.py:153 models/pro.py:274
+#: models/crfpa.py:153 models/pro.py:273
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
-#: models/crfpa.py:154 models/pro.py:275
+#: models/crfpa.py:154 models/pro.py:274
 msgid "Password initialized"
 msgstr "Mot de passe initialisé"
 
@@ -378,104 +378,104 @@ msgstr "Mot de passe initialisé"
 msgid "profile"
 msgstr "profil"
 
-#: models/pro.py:56
+#: models/pro.py:55
 msgid "Seminar type"
 msgstr "Type de séminaire"
 
-#: models/pro.py:73
+#: models/pro.py:72
 msgid "index"
 msgstr "index"
 
-#: models/pro.py:81
+#: models/pro.py:80
 msgid "documents 1"
 msgstr "documents 1"
 
-#: models/pro.py:84
+#: models/pro.py:83
 msgid "media"
 msgstr "médias"
 
-#: models/pro.py:87
+#: models/pro.py:86
 msgid "media_preview"
 msgstr ""
 
-#: models/pro.py:90
+#: models/pro.py:89
 msgid "documents 2"
 msgstr "documents 2"
 
-#: models/pro.py:93
+#: models/pro.py:92
 msgid "corrected documents"
 msgstr "documents corrigés"
 
-#: models/pro.py:95
+#: models/pro.py:94
 msgid "form"
 msgstr "formulaire"
 
-#: models/pro.py:131 templates/teleforma/answer_form.html:112
+#: models/pro.py:130 templates/teleforma/answer_form.html:112
 #: templates/teleforma/seminar_detail.html:162
 #: templates/teleforma/inc/answer_list.html:14
 msgid "Seminar"
 msgstr "Séminaire"
 
-#: models/pro.py:139 models/pro.py:209 models/pro.py:301
+#: models/pro.py:138 models/pro.py:208 models/pro.py:300
 msgid "seminar"
 msgstr "séminaire"
 
-#: models/pro.py:142 models/pro.py:160
+#: models/pro.py:141 models/pro.py:159
 msgid "question"
 msgstr "question"
 
-#: models/pro.py:145
+#: models/pro.py:144
 msgid "minimum numbers of characters"
 msgstr "nombre de caractère minimum"
 
-#: models/pro.py:146 models/pro.py:162 models/pro.py:264
+#: models/pro.py:145 models/pro.py:161 models/pro.py:263
 msgid "status"
 msgstr "status"
 
-#: models/pro.py:153
+#: models/pro.py:152
 msgid "Question"
 msgstr "Question"
 
-#: models/pro.py:161 views/pro.py:332
+#: models/pro.py:160 views/pro.py:332
 msgid "answer"
 msgstr "consultation"
 
-#: models/pro.py:163
+#: models/pro.py:162
 msgid "treated"
 msgstr ""
 
-#: models/pro.py:164 templates/teleforma/seminar_detail.html:50
+#: models/pro.py:163 templates/teleforma/seminar_detail.html:50
 #: templates/teleforma/seminars.html:99 views/pro.py:333
 msgid "validated"
 msgstr "validée"
 
-#: models/pro.py:165
+#: models/pro.py:164
 msgid "date submitted"
 msgstr "date de soumission"
 
-#: models/pro.py:166
+#: models/pro.py:165
 msgid "date validated"
 msgstr "date de validation"
 
-#: models/pro.py:186 templates/teleforma/answer_detail.html:45
+#: models/pro.py:185 templates/teleforma/answer_detail.html:45
 #: templates/teleforma/answer_form.html:115
 #: templates/teleforma/seminar_testimonial_knowledge.html:44
 msgid "Answer"
 msgstr "Réponse à la consultation"
 
-#: models/pro.py:195
+#: models/pro.py:194
 msgid "comments"
 msgstr "commentaires"
 
-#: models/pro.py:197 models/pro.py:214
+#: models/pro.py:196 models/pro.py:213
 msgid "template"
 msgstr "modèle"
 
-#: models/pro.py:204
+#: models/pro.py:203
 msgid "Testimonial template"
 msgstr "Modèle d'attestation"
 
-#: models/pro.py:249 templates/teleforma/seminar_testimonial.html:13
+#: models/pro.py:248 templates/teleforma/seminar_testimonial.html:13
 #: templates/teleforma/seminar_testimonial_knowledge.html:13
 #: templates/teleforma/seminar_testimonial_payback.html:13
 #: templates/teleforma/inc/testimonial_list.html:7
@@ -483,35 +483,35 @@ msgstr "Modèle d'attestation"
 msgid "Testimonial"
 msgstr "Attestation"
 
-#: models/pro.py:257
+#: models/pro.py:256
 msgid "seminars"
 msgstr "séminaires"
 
-#: models/pro.py:260
+#: models/pro.py:259
 msgid "conferences"
 msgstr "conférences"
 
-#: models/pro.py:265
+#: models/pro.py:264
 msgid "gender"
 msgstr "civilité"
 
-#: models/pro.py:266
+#: models/pro.py:265
 msgid "Company"
 msgstr "Entreprise / Organisme"
 
-#: models/pro.py:273
+#: models/pro.py:272
 msgid "Fax"
 msgstr "Fax"
 
-#: models/pro.py:295
+#: models/pro.py:294
 msgid "Auditor"
 msgstr "Auditeur"
 
-#: models/pro.py:311
+#: models/pro.py:310
 msgid "Seminar revision"
 msgstr "Révision des sémimaires"
 
-#: models/pro.py:312
+#: models/pro.py:311
 msgid "Seminar revisions"
 msgstr "Révisions des sémimaires"
 
@@ -1107,6 +1107,21 @@ msgstr "évaluer la formation suivie"
 msgid "Help"
 msgstr "Aide"
 
+#: templates/teleforma/media_pending.html:7
+msgid "Peding media"
+msgstr ""
+
+#: templates/teleforma/media_pending.html:27
+#: templates/teleforma/testimonials.html:7
+#: templates/teleforma/testimonials.html:45 templates/telemeta/base.html:111
+msgid "Testimonials"
+msgstr "Attestations"
+
+#: templates/teleforma/media_pending.html:45
+#: templates/teleforma/testimonials.html:86
+msgid "No testimonial"
+msgstr "Aucune attestation"
+
 #: templates/teleforma/seminar_detail.html:60
 msgid "Informations"
 msgstr "Informations"
@@ -1247,11 +1262,6 @@ msgstr "au"
 msgid "Access"
 msgstr "Accéder"
 
-#: templates/teleforma/testimonials.html:7
-#: templates/teleforma/testimonials.html:45 templates/telemeta/base.html:111
-msgid "Testimonials"
-msgstr "Attestations"
-
 #: templates/teleforma/testimonials.html:64
 #: templates/teleforma/testimonials.html:70
 #: templates/teleforma/testimonials.html:76
@@ -1268,10 +1278,6 @@ msgstr "uniquement pour la prise en charge des frais de formation"
 msgid "Payback testimonial"
 msgstr "Attestation de présence et de règlement"
 
-#: templates/teleforma/testimonials.html:86
-msgid "No testimonial"
-msgstr "Aucune attestation"
-
 #: templates/teleforma/inc/answer_list.html:12
 #: templates/telemeta/profile_detail.html:58
 #: templates/telemeta/inc/user_list.html:19
@@ -1437,6 +1443,41 @@ msgstr ""
 "L’équipe e-learning de %(organization)s vous remercie de votre confiance et "
 "reste à votre disposition pour renseignement complémentaire.\n"
 
+#: templates/teleforma/messages/seminar_remind.txt:1
+#, python-format
+msgid ""
+"%(gender)s %(last_name)s,\n"
+"\n"
+"votre abonnement au séminaire e-learning \"%(title)s\" arrive à expiration "
+"le %(date)s.\n"
+"\n"
+"Nous vous rappelons que vous devez achever votre formation avant cette "
+"date.\n"
+"\n"
+"De plus, si vous souhaitez conserver les supports pédagogiques écrits de "
+"votre formation (compte-rendu écrit et recueil(s) de documents d'actualité), "
+"nous vous rappelons que ceux-ci sont entièrement téléchargeables sur la "
+"plate-forme e-learning de Pro-Barreau jusqu'au %(date)s.\"\n"
+"\n"
+"The team of the %(organization)s thank you for your confidence and we remain "
+"at your disposal for further information.\n"
+msgstr ""
+"%(gender)s %(last_name)s,\n"
+"\n"
+"votre abonnement au séminaire e-learning \"%(title)s\" arrive à expiration "
+"le %(date)s.\n"
+"\n"
+"Nous vous rappelons que vous devez achever votre formation avant cette "
+"date.\n"
+"\n"
+"De plus, si vous souhaitez conserver les supports pédagogiques écrits de "
+"votre formation (compte-rendu écrit et recueil(s) de documents d'actualité), "
+"nous vous rappelons que ceux-ci sont entièrement téléchargeables sur la "
+"plate-forme e-learning de Pro-Barreau jusqu'au %(date)s.\"\n"
+"\n"
+"L’équipe e-learning de %(organization)s vous remercie de votre confiance et "
+"reste à votre disposition pour renseignement complémentaire.\n"
+
 #: templates/teleforma/messages/seminar_validated.txt:1
 #, python-format
 msgid ""
@@ -1794,6 +1835,10 @@ msgstr "conditions de validation d'une consultation"
 msgid "You have successfully submitted your evaluation"
 msgstr "Vous avez soumis votre évaluation avec succès"
 
+#, fuzzy
+#~ msgid "%(gender)s"
+#~ msgstr "civilité"
+
 #~ msgid "Remote presence testimonial"
 #~ msgstr "Attestation de suivi à distance"
 

diff --git a/teleforma/management/commands/teleforma-message-all-seminar-users.py b/teleforma/management/commands/teleforma-message-all-seminar-users.py
index d14cfe1186f1b361f7bd4b498725b84b4c23f3cb..f8c7988f5c2ce44b1479b58dffe51dc1e8d32ca2 100644 (file)
--- a/teleforma/management/commands/teleforma-message-all-seminar-users.py
+++ b/teleforma/management/commands/teleforma-message-all-seminar-users.py
@@ -59,7 +59,6 @@ class Command(BaseCommand):
                     
                     text = render_to_string(self.message_template, context)
                     subject = render_to_string(self.subject_template, context)
-                    subject = '%s : %s' % (seminar.title, subject)
 
                     mess = Message(sender=sender, recipient=user, subject=subject[:119], body=text)
                     mess.moderation_status = 'a'

diff --git a/teleforma/templates/teleforma/messages/seminar_remind.txt b/teleforma/templates/teleforma/messages/seminar_remind.txt
index 86ba63fdbc14dc4b533e4aa085df7e2db85d7ed5..1e5722072e5fee885d122ae766476a5a47073cac 100644 (file)
--- a/teleforma/templates/teleforma/messages/seminar_remind.txt
+++ b/teleforma/templates/teleforma/messages/seminar_remind.txt
@@ -1,11 +1,10 @@
-{% load i18n %}{% autoescape off %}{% blocktrans %}{{ gender }}{% endblocktrans %} {{ last_name }},
+{% load i18n %}{% autoescape off %}{% blocktrans %}{{ gender }} {{ last_name }},
 
 votre abonnement au séminaire e-learning "{{ title }}" arrive à expiration le {{ date }}.
 
 Nous vous rappelons que vous devez achever votre formation avant cette date.
 
-De plus, si vous souhaitez conserver les supports pédagogiques écrits de votre formation (compte-rendu écrit et recueil(s) de documents d'actualité), nous vous rappelons que ceux-ci sont entièrement téléchargeables sur la plate-forme e-learning de Pro-Barreau jusqu'au {{ date }} minuit."
+De plus, si vous souhaitez conserver les supports pédagogiques écrits de votre formation (compte-rendu écrit et recueil(s) de documents d'actualité), nous vous rappelons que ceux-ci sont entièrement téléchargeables sur la plate-forme e-learning de Pro-Barreau jusqu'au {{ date }}."
 
-{% blocktrans %} 
 The team of the {{ organization }} thank you for your confidence and we remain at your disposal for further information.
 {% endblocktrans %}{% endautoescape %}