From bd46c5bcd7814caf8616ebc4e062cafdee093952 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 3 Sep 2017 12:11:19 +0200
Subject: [PATCH] added timezone detection

---
 rowers/templates/basebase.html  | 2 ++
 rowers/templates/frontpage.html | 3 +++
 rowers/views.py                 | 2 +-
 rowsandall_app/settings.py      | 8 ++++++--
 rowsandall_app/urls.py          | 1 +
 templates/basebase.html         | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/rowers/templates/basebase.html b/rowers/templates/basebase.html
index 199b53d8..1e3cdb3a 100644
--- a/rowers/templates/basebase.html
+++ b/rowers/templates/basebase.html
@@ -1,5 +1,7 @@
 {% load cookielaw_tags %}
 {% load leaflet_tags %}
+{% load tz_detect %}
+{% tz_detect %}
 {% load analytical %}
 {% block filters %}
 {% endblock %}
diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index 3266a21b..99aedc9b 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -7,6 +7,9 @@
 {% block content %}
 
 <div class="grid_12">
+  <p class="midden">
+    Local Time: {% now "jS F Y H:i" %}
+    </p>
 <p class="midden">
 	Compatible with:
 	<img src="/static/img/stravasquare.png" alt="Strava icon" width="30" height="30">
diff --git a/rowers/views.py b/rowers/views.py
index 4187cbd7..33e5adce 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -143,7 +143,7 @@ from dataprep import timedeltaconv
 
 from scipy.interpolate import griddata
 
-LOCALTIMEZONE = tz('Etc/UTC')
+#LOCALTIMEZONE = tz('Etc/UTC')
 USER_LANGUAGE = 'en-US'
 
 from interactiveplots import *
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index c6d39160..98d21718 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -62,7 +62,8 @@ INSTALLED_APPS = [
     'corsheaders',
     'analytical',
     'cookielaw',
-    'django_extensions'
+    'django_extensions',
+    'tz_detect'
 ]
 
 AUTHENTICATION_BACKENDS = (
@@ -90,6 +91,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'async_messages.middleware.AsyncMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'tz_detect.middleware.TimezoneMiddleware',
 ]
 
 ROOT_URLCONF = 'rowsandall_app.urls'
@@ -174,7 +176,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
-TIME_ZONE = 'UTC'
+#TIME_ZONE = 'UTC'
 
 USE_I18N = True
 
@@ -182,6 +184,8 @@ USE_L10N = True
 
 USE_TZ = True
 
+TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')
+
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),    
     os.path.join(BASE_DIR, 'cvkbrno/locale'),    
diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py
index 1c8750bd..b7c2cb11 100644
--- a/rowsandall_app/urls.py
+++ b/rowsandall_app/urls.py
@@ -71,6 +71,7 @@ urlpatterns += [
     url(r'^tp\_callback',rowersviews.rower_process_tpcallback),
     url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
     url(r'^i18n/', include('django.conf.urls.i18n')),
+    url(r'^tz_detect/', include('tz_detect.urls')),
     ]
 
 
diff --git a/templates/basebase.html b/templates/basebase.html
index 4f89aad6..65d611f9 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -1,5 +1,7 @@
 {% load leaflet_tags %}
 {% load cookielaw_tags %}
+{% load tz_detect %}
+{% tz_detect %}
 {% load analytical %}
 {% block filters %}
 {% endblock %}