sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

better localization

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-01 13:27:41 +02:00
parent 63e30caaa1
commit f80bb04b02
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/templates/list_courses.html
View File

@@ -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 %}

3
rowers/templates/virtualevents.html
View File

@@ -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 %}

26
rowers/views/racesviews.py
View File

@@ -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'],
}
)