Skip to content

Commit

Permalink
Show creation and modification dates
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Dec 12, 2018
1 parent e570f13 commit 6d316bc
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 18 deletions.
11 changes: 10 additions & 1 deletion cabinet/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import admin
from django.template.defaultfilters import filesizeformat
from django.utils.formats import date_format
from django.utils.html import format_html, format_html_join, mark_safe
from django.utils.translation import ugettext_lazy as _

Expand Down Expand Up @@ -76,7 +77,15 @@ def admin_file_name(self, instance):
admin_file_name.short_description = _("file name")

def admin_details(self, instance):
details = [instance.caption, instance.copyright]
details = [
instance.caption,
instance.copyright,
_("Created %(created_at)s, last modified %(updated_at)s")
% {
"created_at": date_format(instance.created_at, "SHORT_DATE_FORMAT"),
"updated_at": date_format(instance.updated_at, "SHORT_DATE_FORMAT"),
},
]
return format_html(
"<small>{}</small>",
format_html_join(mark_safe("<br>"), "{}", ((d,) for d in details if d)),
Expand Down
Binary file modified cabinet/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
47 changes: 30 additions & 17 deletions cabinet/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-11 21:55+0100\n"
"POT-Creation-Date: 2018-12-12 10:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -17,23 +17,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

#: admin.py:31 admin.py:37
#: admin.py:32 admin.py:38
msgid "Advanced"
msgstr "Fortgeschritten"

#: admin.py:44 base.py:82
#: admin.py:45 base.py:82
msgid "Image"
msgstr "Bild"

#: admin.py:47
#: admin.py:48
msgid "Download"
msgstr "Download"

#: admin.py:76 base.py:213
#: admin.py:77 base.py:221
msgid "file name"
msgstr "Dateiname"

#: admin.py:85
#: admin.py:83 templates/admin/cabinet/file/change_list.html:106
#, python-format
msgid "Created %(created_at)s, last modified %(updated_at)s"
msgstr "Erstellt %(created_at)s, letzte Änderung %(updated_at)s"

#: admin.py:93
msgid "details"
msgstr "Details"

Expand Down Expand Up @@ -125,25 +130,33 @@ msgstr ""
"Standardmässig wird jeweils ein neuer Dateiname generiert, was auch beim "
"Caching hilft."

#: base.py:209 base_admin.py:101 fields.py:14 models.py:40
#: base.py:204
msgid "created at"
msgstr "erstellt um"

#: base.py:205
msgid "updated at"
msgstr "aktualisiert um"

#: base.py:217 base_admin.py:101 fields.py:14 models.py:46
#: templates/admin/cabinet/file/change_list.html:24
#: templates/admin/cabinet/folder/change_form.html:15
msgid "folder"
msgstr "Ordner"

#: base.py:214
#: base.py:222
msgid "file size"
msgstr "Dateigrösse"

#: base.py:219 fields.py:15
#: base.py:227 fields.py:15
msgid "file"
msgstr "Datei"

#: base.py:220 base_admin.py:112
#: base.py:228 base_admin.py:112
msgid "files"
msgstr "Dateien"

#: base.py:241
#: base.py:249
msgid "Please fill in exactly one file field!"
msgstr "Bitte genau ein Dateifeld ausfüllen!"

Expand Down Expand Up @@ -201,23 +214,23 @@ msgstr "Die Dateien wurden erfolgreich verschoben."
msgid "Root folder"
msgstr "Oberster Ordner"

#: models.py:35
#: models.py:41
msgid "name"
msgstr "Name"

#: models.py:41
#: models.py:47
msgid "folders"
msgstr "Ordner"

#: models.py:51
#: models.py:57
msgid "Root folder with same name exists already."
msgstr "Ordner mit gleichem Namen existiert schon auf oberster Ebene."

#: models.py:61
#: models.py:67
msgid "caption"
msgstr "Legende"

#: models.py:62
#: models.py:68
msgid "copyright"
msgstr "Copyright"

Expand Down Expand Up @@ -248,7 +261,7 @@ msgstr "%(num_subfolders)s Unterordner, %(num_files)s Dateien"
msgid "Change folder"
msgstr "Ordner ändern"

#: templates/admin/cabinet/file/change_list.html:111
#: templates/admin/cabinet/file/change_list.html:115
msgid "Upload files by dropping them into the list above."
msgstr "Dateien oben hinziehen um sie hochzuladen."

Expand Down
4 changes: 4 additions & 0 deletions cabinet/templates/admin/cabinet/file/change_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
{% endblocktrans %}
<a href="{% url 'admin:cabinet_folder_change' f.id %}?{{ cabinet.querystring }}"
title="{% trans 'Change folder' %}" class="changelink"></a>
<br>
{% blocktrans with created_at=f.created_at|date:"SHORT_DATE_FORMAT" updated_at=f.updated_at|date:"SHORT_DATE_FORMAT" trimmed %}
Created {{ created_at }}, last modified {{ updated_at }}
{% endblocktrans %}
</small>
</td>
</tr>
Expand Down

0 comments on commit 6d316bc

Please sign in to comment.