mirror of
https://github.com/chubin/wttr.in
synced 2025-01-26 02:34:59 +00:00
Check and observe region and country in building formatted location
This commit is contained in:
parent
deb2a5d01f
commit
afde91211c
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue