diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
commit | 764182c0ca66b538cef994409f04f876681598cd (patch) | |
tree | 2f399c618484c00f84875b437f3fcfcc9c509424 /templates/devel/clock.html | |
parent | 8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff) | |
parent | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff) |
Merge commit '822898e' (Merge branch 'django14')
Conflicts:
requirements.txt
requirements_prod.txt
templates/base.html
templates/devel/clock.html
templates/public/download.html
templates/public/index.html
templates/releng/results.html
Diffstat (limited to 'templates/devel/clock.html')
-rw-r--r-- | templates/devel/clock.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 06324d84..e8a7bf11 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load tz %} {% block title %}Parabola GNU/Linux-libre - Hackers World Clocks{% endblock %} @@ -10,7 +11,6 @@ depends on hackers keeping the time zone information up to date, so if you see 'UTC' listed, pester them to update their settings.</p> <p> - Parabola Server Time: {{ now|date:"Y-m-d H:i T" }}<br/> UTC Time: {{ utc_now|date:"Y-m-d H:i T" }} </p> @@ -33,7 +33,7 @@ <td>{{ dev.userprofile.alias }}</td> <td>{{ dev.userprofile.location }}</td> <td>{{ dev.userprofile.time_zone }}</td> - <td>{{ dev.current_time|date:"Y-m-d H:i T" }}</td> + <td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}</td> </tr> {% endfor %} </tbody> |