Check and observe region and country in building formatted location

4 years ago · afde91211c
parent deb2a5d01f
commit afde91211c
1 changed files with 3 additions and 3 deletions
--- a/lib/location.py
+++ b/lib/location.py
@ -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