From f80bb04b0278dc3877c27fdc6d1ccc586fd94e78 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 1 Jul 2020 13:27:41 +0200
Subject: [PATCH] better localization

---
 rowers/templates/list_courses.html  |  3 +++
 rowers/templates/virtualevents.html |  3 +++
 rowers/views/racesviews.py          | 26 ++++++++++++++++++++++----
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/rowers/templates/list_courses.html b/rowers/templates/list_courses.html
index cff254e8..d247a90a 100644
--- a/rowers/templates/list_courses.html
+++ b/rowers/templates/list_courses.html
@@ -67,6 +67,9 @@
     {% if location %}
     <p>
       <a href="/rowers/list-courses/?nearby=true">Filter nearby courses</a>
+      {{ city }} {{ country_name }} {{ time_zone }}
+    </p>
+    <p>
       <a href="/rowers/list-courses/">All courses</a>
     </p>
     {% endif %}
diff --git a/rowers/templates/virtualevents.html b/rowers/templates/virtualevents.html
index 9eaddfe2..e2b06add 100644
--- a/rowers/templates/virtualevents.html
+++ b/rowers/templates/virtualevents.html
@@ -77,6 +77,9 @@
   {% if location %}
   <p>
     <a href="/rowers/virtualevents/?nearby=true">Challenges in your area</a>
+    {{ city }} {{ country_name }} {{ time_zone }}
+  </p>
+  <p>
     <a href="/rowers/virtualevents/">All Challenges</a>
   </p>
   {% endif %}
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index cd668240..04642d57 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -13,13 +13,18 @@ from django.contrib.gis.geoip2 import GeoIP2
 def courses_view(request):
     r = getrower(request.user)
     g = GeoIP2()
-    ip = request.META.get('REMOTE_ADDR')
+
+    ip = request.META.get('HTTP_X_REAL_IP','1.1.1.1')
     try:
         lat_lon = g.lat_lon(ip)
         city = g.city(ip)
     except:
         lat_lon = None
-        city = None
+        city = {
+            'city': None,
+            'country_name': None,
+            'time_zone': None,
+        }
 
 
     courses = GeoCourse.objects.all().order_by("country","name","distance")
@@ -58,6 +63,9 @@ def courses_view(request):
                    'searchform':searchform,
                    'rower':r,
                    'location':lat_lon,
+                   'city':city['city'],
+                   'country_name': city['country_name'],
+                   'time_zone':city['time_zone'],
                    })
 
 # List Courses
@@ -671,13 +679,17 @@ def virtualevents_view(request):
         is_ajax = True
 
     g = GeoIP2()
-    ip = request.META.get('REMOTE_ADDR')
+    ip = request.META.get('HTTP_X_REAL_IP','1.1.1.1')
     try:
         lat_lon = g.lat_lon(ip)
         city = g.city(ip)
     except:
         lat_lon = None
-        city = None
+        city = {
+            'city': None,
+            'country_name': None,
+            'time_zone': None,
+        }
 
     # default races
     races1 = VirtualRace.objects.filter(
@@ -773,6 +785,9 @@ def virtualevents_view(request):
                       { 'races':races,
                         'rower':r,
                         'location': lat_lon,
+                        'city':city['city'],
+                        'country_name': city['country_name'],
+                        'time_zone':city['time_zone'],
                         })
 
     breadcrumbs = [
@@ -789,6 +804,9 @@ def virtualevents_view(request):
                     'active':'nav-racing',
                     'rower':r,
                     'location': lat_lon,
+                    'city':city['city'],
+                    'country_name': city['country_name'],
+                    'time_zone':city['time_zone'],
                   }
     )