Check and observe region and country in building formatted location

This commit is contained in:
Gregory Danielson 2020-11-01 17:00:09 -06:00
parent deb2a5d01f
commit afde91211c
No known key found for this signature in database
GPG key ID: 88D4EF22F6C14CA7

View file

@ -293,8 +293,8 @@ def location_processing(location, ip_addr):
socket.gethostbyname(
location.lstrip('~ ')[1:]))
location = '~' + location
if country:
location += ", %s" % country
if region and country:
location += ", %s, %s" % (region, country)
hide_full_address = not force_show_full_address
except:
location, region, country = NOT_FOUND_LOCATION, None, None
@ -318,7 +318,7 @@ def location_processing(location, ip_addr):
# here too
if location:
location = '~' + location
if country:
if region and country:
location += ", %s, %s" % (region, country)
hide_full_address = not force_show_full_address