shorter dates and dates labels for admin list

newsbox/admin.py

@@ -11,7 +11,7 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _,  ungettext_lazy
-from django.utils import six
+from django.utils import six, formats
 
 
 def get_fieldset_by_field(name, fieldsets):
@@ -128,7 +128,7 @@ changestatus_link.short_description = _('published')
 class NewsboxBaseAdmin(admin.ModelAdmin):
 
     list_filter = ('newsbox_publication_start_date', 'newsbox_published', )
-    list_display = ['get_newsbox_title', 'newsbox_date',
+    list_display = ['get_newsbox_title', 'newsbox_date_short',
                     'get_newsbox_slug', changestatus_link]
     list_display_links = ('get_newsbox_title',)
     fieldsets = [
@@ -144,6 +144,16 @@ class NewsboxBaseAdmin(admin.ModelAdmin):
         self.prepopulated_fields = {"newsbox_slug": ("newsbox_title",)}
         super(NewsboxBaseAdmin, self).__init__(*args, **kwargs)
 
+    def newsbox_date_short(self, obj):
+        if not obj.newsbox_date:
+            return None
+        return '<span title="%s">%s</span>' % (
+            formats.date_format(obj.newsbox_date, 'DATETIME_FORMAT'),
+            formats.date_format(obj.newsbox_date, 'SHORT_DATE_FORMAT')
+        )
+    newsbox_date_short.short_description = _('pub. date')
+    newsbox_date_short.allow_tags = True
+
     def get_fieldsets(self, request, obj=None):
         """
         Prevent anoying modification of fieldsets class attribute.
@@ -283,6 +293,16 @@ class NewsboxAdmin(NewsboxBaseAdmin):
 
 class NewsboxExpiredAdmin(NewsboxBaseAdmin):
 
+    def newsbox_publication_end_date_short(self, obj):
+        if not obj.newsbox_publication_end_date:
+            return None
+        return '<span title="%s">%s</span>' % (
+            formats.date_format(obj.newsbox_publication_end_date, 'DATETIME_FORMAT'),
+            formats.date_format(obj.newsbox_publication_end_date, 'SHORT_DATE_FORMAT')
+        )
+    newsbox_publication_end_date_short.short_description = _('pub. end date')
+    newsbox_publication_end_date_short.allow_tags = True
+        
     def get_fieldsets(self, request, obj=None):
         fieldsets = super(NewsboxExpiredAdmin, self).get_fieldsets(request, obj)
 
@@ -301,7 +321,7 @@ class NewsboxExpiredAdmin(NewsboxBaseAdmin):
         list_display = super(NewsboxExpiredAdmin, self).get_list_display(request)
 
         list_display = list_display[:2] +\
-            ['newsbox_publication_end_date',] + list_display[2:]
+            ['newsbox_publication_end_date_short',] + list_display[2:]
         return list_display
 
 class NewsboxSEOAdmin(NewsboxBaseAdmin):

newsbox/locale/fr/LC_MESSAGES/django.po

@@ -5,234 +5,183 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-18 15:31+0100\n"
-"PO-Revision-Date: 2014-01-18 15:26+0100\n"
-"Last-Translator: Dylann Cordel <cordel.d@free.fr>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2014-11-27 15:40+0100\n"
+"PO-Revision-Date: 2014-11-27 15:41+0100\n"
+"Last-Translator: DylannCordel <d.cordel@webu.coop>\n"
+"Language-Team: Webu <developpeurs@webu.coop>\n"
 "Language: \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"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../..\n"
 
-#: admin.py:28
-msgid "translations"
-msgstr "traductions"
-
-#: admin.py:53
-msgid "edit"
-msgstr "modifier"
-
-#: admin.py:56 models.py:72
-msgid "title"
-msgstr "titre"
-
-#: admin.py:61
+#: admin.py:109
 #, python-format
 msgid "Unpublish this %s"
 msgstr "Dépublier cette %s"
 
-#: admin.py:65
+#: admin.py:113
 #, python-format
 msgid "Publish this %s"
 msgstr "Publier cette %s"
 
-#: admin.py:75 models.py:169
+#: admin.py:125
+#: models.py:190
 msgid "published"
 msgstr "publiée"
 
-#: admin.py:86
+#: admin.py:137
 msgid "Content"
 msgstr "Contenu"
 
-#: admin.py:100 newsboxcms/models.py:14
+#: admin.py:154
+msgid "pub. date"
+msgstr "date de pub."
+
+#: admin.py:166
 msgid "Title"
 msgstr "Titre"
 
-#: admin.py:104
+#: admin.py:170
 msgid "Slug"
 msgstr "Slug"
 
-#: admin.py:123
+#: admin.py:189
 #, python-format
 msgid "You do not have permission to publish this %s"
 msgstr "Vous n'avez pas la permission de publier cette %s"
 
-#: admin.py:129
+#: admin.py:198
 #, python-format
-msgid "The %(objtype)s \"%(objtitle)s\" was  successfully published"
+msgid "The %(objtype)s \"%(objtitle)s\" was successfully published"
 msgstr "Cette %(objtype)s \"%(objtitle)s\" a été publiée avec succès"
 
-#: admin.py:135
+#: admin.py:208
 #, python-format
 msgid "The %(objtype)s \"%(objtitle)s\" was successfully unpublished"
 msgstr "Cette %(objtype)s \"%(objtitle)s\" a été dépubliée avec succès"
 
-#: admin.py:160
+#: admin.py:236
 #, python-format
 msgid "You do not have permission to publish the %(objtype)s \"%(objtitle)s\""
-msgstr ""
-"Vous n'avez pas la permission de publier cette %(objtype)s \"%(objtitle)s\""
+msgstr "Vous n'avez pas la permission de publier cette %(objtype)s \"%(objtitle)s\""
 
-#: admin.py:172
+#: admin.py:249
 #, python-format
 msgid "%(nb)d %(objtype)s was published"
 msgid_plural "%(nb)d %(objtype)s were published"
 msgstr[0] "%(nb)d %(objtype)s a été dépubliée avec succès"
 msgstr[1] "%(nb)d %(objtype)s ont été dépubliées avec succès"
 
-#: admin.py:175
+#: admin.py:252
 #, python-format
 msgid "Publish selected %(verbose_name_plural)s"
 msgstr "Publier les %(verbose_name_plural)s sélectionnées"
 
-#: admin.py:188
+#: admin.py:267
 #, python-format
-msgid ""
-"You do not have permission to unpublish the %(objtype)s \"%(objtitle)s\""
-msgstr ""
-"Vous n'avez pas la permission de dépublier cette %(objtype)s \"%(objtitle)s\""
+msgid "You do not have permission to unpublish the %(objtype)s \"%(objtitle)s\""
+msgstr "Vous n'avez pas la permission de dépublier cette %(objtype)s \"%(objtitle)s\""
 
-#: admin.py:200
+#: admin.py:280
 #, python-format
 msgid "%(nb)d %(objtype)s was unpublished"
 msgid_plural "%(nb)d %(objtype)s were unpublished"
 msgstr[0] "%(nb)d %(objtype)s a été dépubliée avec succès"
 msgstr[1] "%(nb)d %(objtype)s ont été dépubliées avec succès"
 
-#: admin.py:208
+#: admin.py:288
 #, python-format
 msgid "Unpublish selected %(verbose_name_plural)s"
 msgstr "Dépublier les %(verbose_name_plural)s sélectionnées"
 
-#: admin.py:237
+#: admin.py:303
+msgid "pub. end date"
+msgstr "fin de pub."
+
+#: admin.py:315
 msgid "Publication"
 msgstr "Publication"
 
-#: admin.py:244
+#: admin.py:337
 msgid "SEO Settings"
 msgstr "Options de référencement"
 
-#: models.py:75
+#: models.py:17
+msgid "title"
+msgstr "titre"
+
+#: models.py:20
 msgid "slug"
 msgstr "slug"
 
-#: models.py:77
+#: models.py:22
 msgid "The part of the title that is used in the URL"
 msgstr "La partie du titre utilisée dans l'URL"
 
-#: models.py:85 models.py:95
+#: models.py:24
 msgid "summary"
 msgstr "résumé"
 
-#: models.py:89 models.py:97
+#: models.py:26
 msgid "body"
 msgstr "corps"
 
-#: models.py:104
+#: models.py:34
 msgid "meta description"
 msgstr "méta description"
 
-#: models.py:107
+#: models.py:37
 msgid "meta keywords"
 msgstr "méta mots clés"
 
-#: models.py:147
+#: models.py:168
 msgid "creation date"
 msgstr "date de création"
 
-#: models.py:151
+#: models.py:172
 msgid "last update date"
 msgstr "date de dernière modification"
 
-#: models.py:157
+#: models.py:178
 msgid "date"
 msgstr "date"
 
-#: models.py:162
+#: models.py:183
 msgid "publication start date"
 msgstr "date de début de publication"
 
-#: models.py:165
-msgid ""
-"When the news should go live. Status must be \"Published\" for news to go "
-"live."
-msgstr ""
-"Date à laquelle l'actualité sera visible. Le statut doit être \"publié\" "
-"pour que l'actualité soit visible."
-
-#: models.py:178
-#, python-format
-msgid "News n° %s"
-msgstr "Actualité n° %s"
+#: models.py:186
+msgid "When the news should go live. Status must be \"Published\" for news to go live."
+msgstr "Date à laquelle l'actualité sera visible. Le statut doit être \"publié\" pour que l'actualité soit visible."
 
-#: models.py:236 models.py:237
+#: models.py:235
+#: models.py:236
 msgid "news"
 msgstr "actualité"
 
-#: models.py:252
+#: models.py:245
 msgid "publication end date"
 msgstr "date de fin de publication"
 
-#: models.py:255
+#: models.py:248
 msgid "When to expire the news.Leave empty to never expire."
-msgstr ""
-"Date à laquelle l'actualité ne sera plus visible. Laisser vide pour qu'elle "
-"n'expire jamais."
+msgstr "Date à laquelle l'actualité ne sera plus visible. Laisser vide pour qu'elle n'expire jamais."
 
-#: models.py:269
+#: models.py:261
 msgid "indexed"
 msgstr "indéxée"
 
-#: models.py:272
+#: models.py:264
 msgid "An unindexed news will not be indexed by search engines."
-msgstr ""
-"Une actualité non indéxée ne sera jamais indéxée par les moteurs de recherche"
-
-#: views.py:21 newsboxcms/cms_plugins.py:21
-msgid "The choosen news type to display is invalid"
-msgstr "Le type d'actualité à afficher choisi est invalide"
-
-#: newsboxcms/cms_plugins.py:10
-msgid "News list"
-msgstr "Liste d'actualité"
+msgstr "Une actualité non indéxée ne sera jamais indéxée par les moteurs de recherche"
 
-#: newsboxcms/models.py:11
-msgid "News type to display"
-msgstr "Type d'actualité à afficher"
-
-#: newsboxcms/models.py:16
-msgid "Title to display before the list"
-msgstr "Titre à afficher avant la liste"
-
-#: newsboxcms/models.py:18
-msgid "Number of news"
-msgstr "Nombre d'actualité"
-
-#: newsboxcms/models.py:20
-msgid "Number of news to display. \"0\" allow you to display ALL news"
-msgstr ""
-"Nombre d'actualité à afficher. \"0\" permet d'afficher TOUTES les actualités "
-"(sans pagination)"
-
-#: newsboxcms/models.py:23
-msgid "Display a pager"
-msgstr "Affiche une pagination"
-
-#: newsboxcms/models.py:29
-#, fuzzy, python-format
-msgid "Display of a news"
-msgid_plural "Display of %(nb)d news"
-msgstr[0] "Affichage de toutes les actualités"
-msgstr[1] "Affichage de toutes les actualités"
-
-#: newsboxcms/models.py:33
-msgid "Display of all news"
-msgstr "Affichage de toutes les actualités"
-
-#: newsboxcms/templates/newsboxcms/list-cms.html:11
 #: templates/newsbox/list.html:38
 msgid "Read more"
 msgstr "Lire la suite"
@@ -254,6 +203,48 @@ msgstr "Actualités suivantes"
 msgid "See all news"
 msgstr "Voir toutes les actualités"
 
+#~ msgid "translations"
+#~ msgstr "traductions"
+
+#~ msgid "edit"
+#~ msgstr "modifier"
+
+#~ msgid "News n° %s"
+#~ msgstr "Actualité n° %s"
+
+#~ msgid "The choosen news type to display is invalid"
+#~ msgstr "Le type d'actualité à afficher choisi est invalide"
+
+#~ msgid "News list"
+#~ msgstr "Liste d'actualité"
+
+#~ msgid "News type to display"
+#~ msgstr "Type d'actualité à afficher"
+
+#~ msgid "Title to display before the list"
+#~ msgstr "Titre à afficher avant la liste"
+
+#~ msgid "Number of news"
+#~ msgstr "Nombre d'actualité"
+
+#~ msgid "Number of news to display. \"0\" allow you to display ALL news"
+#~ msgstr ""
+#~ "Nombre d'actualité à afficher. \"0\" permet d'afficher TOUTES les "
+#~ "actualités (sans pagination)"
+
+#~ msgid "Display a pager"
+#~ msgstr "Affiche une pagination"
+
+#, fuzzy
+#~ msgid "Display of a news"
+
+#~ msgid_plural "Display of %(nb)d news"
+#~ msgstr[0] "Affichage de toutes les actualités"
+#~ msgstr[1] "Affichage de toutes les actualités"
+
+#~ msgid "Display of all news"
+#~ msgstr "Affichage de toutes les actualités"
+
 #~ msgid ""
 #~ "\n"
 #~ "                                    Page %(number)s on %(total)s\n"
@@ -265,6 +256,7 @@ msgstr "Voir toutes les actualités"
 
 #, fuzzy
 #~ msgid "%d %s was published"
+
 #~ msgid_plural "%d %s were published"
 #~ msgstr[0] "publiée"
 #~ msgstr[1] "publiée"

newsbox_cms/admin.py

@@ -134,6 +134,6 @@ class NewsboxCMSAdmin(
 
     def get_list_display(self, request):
         list_display = super(NewsboxCMSAdmin, self).get_list_display(request)
-        list_display.remove('newsbox_date')
+        list_display.remove('newsbox_date_short')
         list_display.remove('get_newsbox_slug')
         return list_display

newsbox_cms/locale/fr/LC_MESSAGES/django.po

@@ -5,78 +5,90 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-20 10:29+0100\n"
-"PO-Revision-Date: 2014-02-20 10:31+0100\n"
-"Last-Translator: \n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2014-11-27 15:33+0100\n"
+"PO-Revision-Date: 2014-11-27 15:38+0100\n"
+"Last-Translator: DylannCordel <d.cordel@webu.coop>\n"
+"Language-Team: Webu <developpeurs@webu.coop>\n"
 "Language: \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"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../..\n"
 
-#: admin.py:20
+#: admin.py:31
 msgid "title"
 msgstr "Titre"
 
-#: admin.py:70
+#: admin.py:81
 msgid "show object's page"
 msgstr "Afficher la page de l'objet"
 
-#: admin.py:71
+#: admin.py:82
 msgid "edit object's parameters"
 msgstr "Éditer les paramètres de l'objet"
 
-#: cms_plugins.py:10
+#: cms_plugins.py:11
 msgid "News list"
 msgstr "Liste d'actualités"
 
-#: cms_plugins.py:19
+#: cms_plugins.py:21
 msgid "The choosen news type to display is invalid"
 msgstr "Le type d'actualité à afficher choisi est invalide"
 
-#: models.py:12
+#: models.py:17
+msgid "summary"
+msgstr "résumé"
+
+#: models.py:20
+msgid "body"
+msgstr "contenu"
+
+#: models.py:29
 msgid "Title"
 msgstr "Titre"
 
-#: models.py:14
+#: models.py:31
 msgid "Title to display before the list"
 msgstr "Titre à afficher avant la liste"
 
-#: models.py:16
+#: models.py:33
 msgid "Number of news"
 msgstr "Nombre d'actualités"
 
-#: models.py:18
+#: models.py:35
 msgid "Number of news to display. \"0\" allow you to display ALL news"
 msgstr "numbre d'actualités à afficher. Saisir \"0\" permet de TOUTES les afficher"
 
-#: models.py:21
+#: models.py:38
 msgid "Display a pager"
 msgstr "Affiche une pagination"
 
-#: models.py:24
+#: models.py:41
 msgid "All news page"
 msgstr "Toutes les pages des actualités"
 
-#: models.py:26
+#: models.py:43
 msgid "Page displaying all news"
 msgstr "Affichage de toutes les actualités"
 
-#: models.py:31
+#: models.py:48
 #, python-format
 msgid "Display of a news"
 msgid_plural "Display of %(nb)d news"
 msgstr[0] "Affichage de l'actualité"
 msgstr[1] "Affichage de  %(nb)d actualités"
 
-#: models.py:35
+#: models.py:52
 msgid "Display of all news"
 msgstr "Affichage de toutes les actualités"
 
-#: templates/newsbox_cms/list-cms.html:11
+#: templates/newsbox_cms/list-cms.html:13
 msgid "Read more"
 msgstr "Lire la suite"
 

newsbox_hvad/locale/fr/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-27 15:35+0100\n"
+"PO-Revision-Date: 2014-11-27 15:37+0100\n"
+"Last-Translator: DylannCordel <d.cordel@webu.coop>\n"
+"Language-Team: Webu <developpeurs@webu.coop>\n"
+"Language: \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"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../..\n"
+
+#: admin.py:23
+msgid "translations"
+msgstr "traductions"
+
+#: models.py:45
+#, python-format
+msgid "News #%d"
+msgstr "Actualité n° %d"
+
+#: models.py:81
+#: models.py:82
+msgid "news"
+msgstr "actualités"
+

newsbox_hvad/models.py

@@ -42,7 +42,7 @@ class NewsboxHVADBase(six.with_metaclass(NewsboxHVADModelBase, TranslatableModel
     def __str__(self):
         return self.lazy_translation_getter(
             'newsbox_title',
-            _('News n° %s') % self.pk)
+            _('News #%d') % self.pk)
 
     def get_slug(self, language=None, *args, **kwargs):
         """