aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksej <deletesoftware@yandex.ru>2012-08-13 22:19:23 +0400
committerAleksej <deletesoftware@yandex.ru>2012-08-13 22:19:23 +0400
commitb3b42bbe7b46f2ff0560d60acef749489dc51837 (patch)
tree8a0350d98cda25e01ef8ff5f2c1519287bc3766d
parent9d3e56d500544b8886e3768a30b85e30cbd70e1f (diff)
downloadmediagoblin-b3b42bbe7b46f2ff0560d60acef749489dc51837.tar.lz
mediagoblin-b3b42bbe7b46f2ff0560d60acef749489dc51837.tar.xz
mediagoblin-b3b42bbe7b46f2ff0560d60acef749489dc51837.zip
use YYYY-MM-DD HH:MM 24-hour format on panels
-rw-r--r--mediagoblin/templates/mediagoblin/admin/panel.html6
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/processing_panel.html6
2 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html
index 0da3c18f..741c01e7 100644
--- a/mediagoblin/templates/mediagoblin/admin/panel.html
+++ b/mediagoblin/templates/mediagoblin/admin/panel.html
@@ -41,7 +41,7 @@
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td>
<td>{{ media_entry.title }}</td>
- <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.transcoding_progress %}
<td>{{ media_entry.transcoding_progress }}%</td>
{% else %}
@@ -71,7 +71,7 @@
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td>
<td>{{ media_entry.title }}</td>
- <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.get_fail_exception() %}
<td>{{ media_entry.get_fail_exception().general_message }}</td>
<td>{{ media_entry.fail_metadata }}</td>
@@ -100,7 +100,7 @@
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.get_uploader.username }}</td>
<td><a href="{{ media_entry.url_for_self(request.urlgen) }}">{{ media_entry.title }}</a></td>
- <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ media_entry.created.strftime("%F %R") }}</td>
</tr>
{% endfor %}
</table>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
index ecbfb409..ed1198f9 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
@@ -39,7 +39,7 @@
<tr>
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.title }}</td>
- <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.transcoding_progress %}
<td>{{ media_entry.transcoding_progress }}%</td>
{% else %}
@@ -67,7 +67,7 @@
<tr>
<td>{{ media_entry._id }}</td>
<td>{{ media_entry.title }}</td>
- <td>{{ media_entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ media_entry.created.strftime("%F %R") }}</td>
{% if media_entry.get_fail_exception() %}
<td>{{ media_entry.get_fail_exception().general_message }}</td>
<td>{{ media_entry.fail_metadata }}</td>
@@ -95,7 +95,7 @@
<tr>
<td>{{ entry._id }}</td>
<td><a href="{{ entry.url_for_self(request.urlgen) }}">{{ entry.title }}</a></td>
- <td>{{ entry.created.strftime("%m-%d-%Y %I:%M %p") }}</td>
+ <td>{{ entry.created.strftime("%F %R") }}</td>
</tr>
{% endfor %}
</table>