Current location

narf Source control manager Git

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Mehani <shtrom+mediagoblin@ssji.net>2019-03-03 22:17:27 +1100
committerOlivier Mehani <shtrom+mediagoblin@ssji.net>2019-03-03 22:17:27 +1100
commitb3578878f1a909386468d861bb4363797f3b63e4 (patch)
tree099542bb9d22a64a49faa6e25da637a5ca15e126
parent0c092bf3a9e0b29279d060c7ae51b5508d00e53a (diff)
Add datetime_format config optionshtrom-s-stable
Signed-off-by: Olivier Mehani <shtrom+mediagoblin@ssji.net>
-rw-r--r--mediagoblin/config_spec.ini3
-rw-r--r--mediagoblin/templates/mediagoblin/fragments/header_notifications.html2
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/image.html2
-rw-r--r--mediagoblin/templates/mediagoblin/moderation/report.html6
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/blog_media.html4
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html4
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/report.html2
7 files changed, 13 insertions, 10 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 0a8da73e..91b8c451 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -92,6 +92,9 @@ no_referrer = boolean(default=True)
# Push stuff
push_urls = string_list(default=list())
+# Python strftime's format [0]
+# https://docs.python.org/library/datetime.html#strftime-strptime-behavior
+datetime_format = string(default="%I:%M%p %Y-%m-%d")
exif_visible = boolean(default=False)
original_date_visible = boolean(default=False)
diff --git a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html
index 58960e7a..1e1683a0 100644
--- a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html
+++ b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html
@@ -21,7 +21,7 @@
user=comment_target.get_actor.username,
media=comment_target.slug_or_id) }}#comment"
class="comment_whenlink">
- <span title='{{- comment_object.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- comment_object.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(comment_object.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html
index d0050f50..93bd72a0 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/image.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/image.html
@@ -35,7 +35,7 @@
{% if original_date %}
<h3>{% trans %}Created{% endtrans %}</h3>
- <p><span title="{{ original_date.strftime("%I:%M%p %Y-%m-%d") }}">
+ <p><span title="{{ original_date.strftime(app_config['datetime_format']) }}">
{%- trans formatted_time=timesince(original_date) -%}
{{ formatted_time }} ago
{%- endtrans -%}
diff --git a/mediagoblin/templates/mediagoblin/moderation/report.html b/mediagoblin/templates/mediagoblin/moderation/report.html
index abbd4a0c..efd1adae 100644
--- a/mediagoblin/templates/mediagoblin/moderation/report.html
+++ b/mediagoblin/templates/mediagoblin/moderation/report.html
@@ -54,7 +54,7 @@
user=target.get_actor.username,
media=target.slug_or_id) }}#comment"
class="comment_whenlink">
- <span title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- comment.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(comment.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
@@ -117,7 +117,7 @@
<a href="{{ request.urlgen('mediagoblin.moderation.reports_detail',
report_id=report.id) }}"
class="report_whenlink">
- <span title='{{- report.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- report.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(report.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
@@ -150,7 +150,7 @@
{% trans %}Status{% endtrans %}:
</h2>
<b>{% trans %}RESOLVED{% endtrans %}</b>
- {{ report.resolved.strftime("%I:%M%p %Y-%m-%d") }}
+ {{ report.resolved.strftime(app_config['datetime_format']) }}
<pre>
<p>{{ report.result }}</p>
</pre>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
index 261b21e7..ab07e222 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html
@@ -128,7 +128,7 @@
user=media.get_actor.username,
media=media.slug_or_id) }}#comment"
class="comment_whenlink">
- <span title='{{- comment_object.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- comment_object.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(comment_object.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
@@ -148,7 +148,7 @@
</div>
<div class="media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3>
- <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
+ <p><span title="{{ media.created.strftime(app_config['datetime_format']) }}">
{%- trans formatted_time=timesince(media.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 51caf9f2..a61bc838 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -145,7 +145,7 @@
user=media.get_actor.username,
media=media.slug_or_id) }}#comment"
class="comment_whenlink">
- <span title='{{- comment_object.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- comment_object.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(comment_object.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
@@ -180,7 +180,7 @@
<div class="five columns media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3>
- <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
+ <p><span title="{{ media.created.strftime(app_config['datetime_format']) }}">
{%- trans formatted_time=timesince(media.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/report.html b/mediagoblin/templates/mediagoblin/user_pages/report.html
index 4a88f4b7..78bcc62a 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/report.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/report.html
@@ -38,7 +38,7 @@
user=media.get_actor.username,
media=media.slug_or_id) }}#comment"
class="comment_whenlink">
- <span title='{{- comment_object.created.strftime("%I:%M%p %Y-%m-%d") -}}'>
+ <span title='{{- comment_object.created.strftime(app_config['datetime_format']) -}}'>
{%- trans formatted_time=timesince(comment_object.created) -%}
{{ formatted_time }} ago
{%- endtrans -%}