From f290cfeb5a97ab9b979a78af946ad57f4897f905 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 29 Sep 2016 15:57:24 -0400
Subject: [PATCH] Added timezone fixes

---
 app/templates/app/processing_node.html | 4 ++--
 webodm/settings.py                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/app/processing_node.html b/app/templates/app/processing_node.html
index 272188e5..7626673a 100644
--- a/app/templates/app/processing_node.html
+++ b/app/templates/app/processing_node.html
@@ -1,5 +1,5 @@
 {% extends "app/logged_in_base.html" %}
-{% load i18n %}
+{% load i18n tz %}
 
 {% block content %}
 <h3>Processing Node</h3>
@@ -22,7 +22,7 @@
 	</tr>
 	<tr>
 		<td>{% trans "Last Refreshed" %}</td>
-		<td>{{ processing_node.last_refreshed }}</td> <!-- TODO: timezone? -->
+		<td>{{ processing_node.last_refreshed|timesince }} {% trans 'ago' %} ({{ processing_node.last_refreshed|localtime }})</td> <!-- TODO: timezone? -->
 	</tr>
 	<tr>
 		<td>{% trans "Options (JSON)" %}</td>
diff --git a/webodm/settings.py b/webodm/settings.py
index 7ae4a5c4..d3e22685 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -115,7 +115,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/1.10/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'UTC'
+TIME_ZONE = None # Use local server time
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True