From e7e8ed4c88e3edbd6f5654ba0203a414aafbcdd6 Mon Sep 17 00:00:00 2001
From: Brian Simpson <bsimpson63@gmail.com>
Date: Sat, 19 Apr 2014 18:46:41 -0400
Subject: [PATCH] Geotargeting: show the country name rather than just the
 code.

---
 r2/r2/lib/pages/pages.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index a5091dae7..9ad151258 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -3570,13 +3570,14 @@ class RenderableCampaign(Templated):
             country = campaign.location.country or ''
             region = campaign.location.region or ''
             metro = campaign.location.metro or ''
-            pieces = [country, region]
+
             if metro:
                 metro_str = (g.locations[country]['regions'][region]
                              ['metros'][metro]['name'])
-                pieces.append(metro_str)
-            pieces = filter(lambda i: i, pieces)
-            self.geotarget = '/'.join(pieces)
+                self.geotarget = '/'.join([country, region, metro_str])
+            else:
+                self.geotarget = g.locations[country]['name']
+
             self.country, self.region, self.metro = country, region, metro
         else:
             self.geotarget = ''