add help texts to newsitem date and event date

diff --git a/emissions/locale/fr/LC_MESSAGES/django.po b/emissions/locale/fr/LC_MESSAGES/django.po
index f3b7b152bfdfbc739c0a094028514a4088526e19..32d6c44e51f11b80887baccf178797bec697cb0b 100644 (file)
--- a/emissions/locale/fr/LC_MESSAGES/django.po
+++ b/emissions/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-panik-emissions 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-02 14:23+0100\n"
+"POT-Creation-Date: 2016-04-21 17:08+0200\n"
 "PO-Revision-Date: 2013-09-04 18:25+0200\n"
 "Last-Translator: Frederic Peters <fpeters@0d.be>\n"
 "Language: fr\n"
@@ -62,7 +62,7 @@ msgstr "Troisième diffusion"
 msgid "Fourth Diffusion"
 msgstr "Quatrième diffusion"
 
-#: models.py:42 models.py:484
+#: models.py:42 models.py:487
 msgid "Category"
 msgstr "Catégorie"
 
@@ -70,8 +70,8 @@ msgstr "Catégorie"
 msgid "Categories"
 msgstr "Catégories"
 
-#: models.py:46 models.py:63 models.py:80 models.py:99 models.py:276
-#: models.py:409 models.py:454 models.py:476 models.py:511
+#: models.py:46 models.py:63 models.py:80 models.py:99 models.py:278
+#: models.py:411 models.py:456 models.py:478 models.py:515
 msgid "Title"
 msgstr "Titre"
 
@@ -83,7 +83,7 @@ msgstr "Couleur"
 msgid "Colours"
 msgstr "Couleurs"
 
-#: models.py:76 models.py:412
+#: models.py:76 models.py:414
 msgid "Format"
 msgstr "Format"
 
@@ -91,7 +91,7 @@ msgstr "Format"
 msgid "Formats"
 msgstr "Formats"
 
-#: models.py:95 models.py:275 models.py:485 models.py:527 models.py:606
+#: models.py:95 models.py:277 models.py:488 models.py:531 models.py:610
 msgid "Emission"
 msgstr "Émission"
 
@@ -99,11 +99,11 @@ msgstr "Émission"
 msgid "Emissions"
 msgstr "Émissions"
 
-#: models.py:101 models.py:278
+#: models.py:101 models.py:280
 msgid "Subtitle"
 msgstr "Sous-titre"
 
-#: models.py:102 models.py:279 models.py:478 models.py:516
+#: models.py:102 models.py:281 models.py:480 models.py:520
 msgid "Description"
 msgstr "Description"
 
@@ -111,11 +111,11 @@ msgstr "Description"
 msgid "Archived"
 msgstr "Archivé"
 
-#: models.py:109 models.py:190 models.py:281 models.py:410
+#: models.py:109 models.py:192 models.py:283 models.py:412
 msgid "Duration"
 msgstr "Durée"
 
-#: models.py:110 models.py:191 models.py:282
+#: models.py:110 models.py:193 models.py:284
 msgid "In minutes"
 msgstr "En minutes"
 
@@ -127,197 +127,205 @@ msgstr "Adresse électronique"
 msgid "Website"
 msgstr "Site web"
 
-#: models.py:115 models.py:284 models.py:480
+#: models.py:115 models.py:286 models.py:483
 msgid "Image"
 msgstr "Illustration"
 
-#: models.py:173
+#: models.py:175
 msgid "Schedule"
 msgstr "Horaire"
 
-#: models.py:174
+#: models.py:176
 msgid "Schedules"
 msgstr "Horaires"
 
-#: models.py:178
+#: models.py:180
 msgid "Every week"
 msgstr "Toutes les semaines"
 
-#: models.py:179
+#: models.py:181
 msgid "First week"
 msgstr "Première semaine"
 
-#: models.py:180
+#: models.py:182
 msgid "Second week"
 msgstr "Deuxième semaine"
 
-#: models.py:181
+#: models.py:183
 msgid "Third week"
 msgstr "Troisième semaine"
 
-#: models.py:182
+#: models.py:184
 msgid "Fourth week"
 msgstr "Quatrième semaine"
 
-#: models.py:183
+#: models.py:185
 msgid "First and third week"
 msgstr "Première et troisième semaine"
 
-#: models.py:184
+#: models.py:186
 msgid "Second and fourth week"
 msgstr "Deuxième et quatrième semaine"
 
-#: models.py:188
+#: models.py:190
 msgid "Weeks"
 msgstr "Semaines"
 
-#: models.py:189
+#: models.py:191
 msgid "Rerun"
 msgstr "Rediffusion"
 
-#: models.py:196
+#: models.py:198
 msgid "1st of the month"
 msgstr "1er du mois"
 
-#: models.py:198
+#: models.py:200
 msgid "2nd of the month"
 msgstr "2e du mois"
 
-#: models.py:200
+#: models.py:202
 msgid "3rd of the month"
 msgstr "3e du mois"
 
-#: models.py:202
+#: models.py:204
 msgid "4th of the month"
 msgstr "4e du mois"
 
-#: models.py:204
+#: models.py:206
 msgid "1st and 3rd"
 msgstr "1er et 3e"
 
-#: models.py:206
+#: models.py:208
 msgid "2nd and 4th"
 msgstr "2e et 4e"
 
-#: models.py:271 models.py:367 models.py:402 models.py:529
+#: models.py:273 models.py:369 models.py:404 models.py:533
 msgid "Episode"
 msgstr "Épisode"
 
-#: models.py:272
+#: models.py:274
 msgid "Episodes"
 msgstr "Épisodes"
 
-#: models.py:280 models.py:483
+#: models.py:282 models.py:486
 msgid "Tags"
 msgstr "Tags"
 
-#: models.py:364
+#: models.py:366
 msgid "Diffusion"
 msgstr "Diffusion"
 
-#: models.py:365
+#: models.py:367
 msgid "Diffusions"
 msgstr "Diffusions"
 
-#: models.py:368 models.py:385
+#: models.py:370 models.py:387
 msgid "Date/time"
 msgstr "Date et heure"
 
-#: models.py:381
+#: models.py:383
 msgid "Absence"
 msgstr "Absence"
 
-#: models.py:382
+#: models.py:384
 msgid "Absences"
 msgstr "Absences"
 
-#: models.py:398 models.py:531
+#: models.py:400 models.py:535
 msgid "Sound file"
 msgstr "Fichier son"
 
-#: models.py:399
+#: models.py:401
 msgid "Sound files"
 msgstr "Fichiers son"
 
-#: models.py:403
+#: models.py:405
 msgid "File"
 msgstr "Fichier"
 
-#: models.py:404
+#: models.py:406
 msgid "Podcastable"
 msgstr "Podcastable"
 
-#: models.py:406
+#: models.py:408
 msgid "The file can be published online according to SABAM rules."
 msgstr "Le fichier peut être mis en ligne en respectant la SABAM."
 
-#: models.py:407
+#: models.py:409
 msgid "Fragment"
 msgstr "Fragment"
 
-#: models.py:408
+#: models.py:410
 msgid "The file is some segment or extra content, not the complete recording."
 msgstr ""
 "Le fichier est une partie ou du contenu supplémentaire, pas l'enregistrement "
 "complet."
 
-#: models.py:410
+#: models.py:412
 msgid "In seconds"
 msgstr "En secondes"
 
-#: models.py:450
+#: models.py:452
 msgid "News Category"
 msgstr "Catégorie d'actu"
 
-#: models.py:451
+#: models.py:453
 msgid "News Categories"
 msgstr "Catégories d'actu"
 
-#: models.py:472 models.py:525
+#: models.py:474 models.py:529
 msgid "News Item"
 msgstr "Actu"
 
-#: models.py:473
+#: models.py:475
 msgid "News Items"
 msgstr "Actus"
 
-#: models.py:479
+#: models.py:481
 msgid "Publication Date"
 msgstr "Date de publication"
 
-#: models.py:487
+#: models.py:482
+msgid "The news won't appear on the website before this date."
+msgstr "L'actu n'apparaitra pas sur le site avant cette date."
+
+#: models.py:490
 msgid "Expiration Date"
 msgstr "Date d'expiration"
 
-#: models.py:488
+#: models.py:491
 msgid "Event Date"
 msgstr "Date de l'événement"
 
-#: models.py:507
+#: models.py:492
+msgid "If this is an event, set the date here so it appears in the agenda."
+msgstr "Si c'est un événement, en mettre la date ici le fera apparaître dans l'agenda."
+
+#: models.py:511
 msgid "Nonstop zone"
 msgstr "Zone nonstop"
 
-#: models.py:508
+#: models.py:512
 msgid "Nonstop zones"
 msgstr "Zones nonstop"
 
-#: models.py:514
+#: models.py:518
 msgid "Start"
 msgstr "Début"
 
-#: models.py:515
+#: models.py:519
 msgid "End"
 msgstr "fin"
 
-#: models.py:523
+#: models.py:527
 msgid "Alternate Title"
 msgstr "Titre alternatif"
 
-#: models.py:533
+#: models.py:537
 msgid "Page"
 msgstr "Page"
 
-#: models.py:604
+#: models.py:608
 msgid "News"
 msgstr "Actu"
 
@@ -325,11 +333,11 @@ msgstr "Actu"
 msgid "Event Date:"
 msgstr "Date de l'événement :"
 
-#: views.py:43
+#: views.py:45
 msgid "Your changes will appear online in a few minutes."
 msgstr "Vos modifications seront effectives sur le site dans quelques minutes."
 
-#: views.py:201
+#: views.py:203
 msgid "Record"
 msgstr "Enregistrement"
 

diff --git a/emissions/models.py b/emissions/models.py
index b24981295aa39bb913eaa5ce0efde13d347fa88f..be32d88c0dff93111fed073d121d64a2107f2dbd 100644 (file)
--- a/emissions/models.py
+++ b/emissions/models.py
@@ -478,7 +478,8 @@ class NewsItem(models.Model):
     title = models.CharField(_('Title'), max_length=200)
     slug = models.SlugField(max_length=200)
     text = RichTextField(_('Description'))
-    date = models.DateField(_('Publication Date'))
+    date = models.DateField(_('Publication Date'),
+            help_text=_('The news won\'t appear on the website before this date.'))
     image = models.ImageField(_('Image'),
             upload_to=get_newsitem_image_path, max_length=250, null=True, blank=True)
 
@@ -487,7 +488,8 @@ class NewsItem(models.Model):
     emission = models.ForeignKey('Emission', verbose_name=_('Emission'), null=True, blank=True)
 
     expiration_date = models.DateField(_('Expiration Date'), null=True, blank=True)
-    event_date = models.DateField(_('Event Date'), null=True, blank=True)
+    event_date = models.DateField(_('Event Date'), null=True, blank=True,
+            help_text=_('If this is an event, set the date here so it appears in the agenda.'))
 
     # denormalized from Focus
     got_focus = models.DateTimeField(default=None, null=True, blank=True)