Merge lp:~ken-vandine/gwibber/lp_1055762 into lp:gwibber

[Ken VanDine]

decode the translated string for "at" (LP: #1055762)

[lp:~ken-vandine/gwibber/lp_1055762]

1384. By Ken VanDine on 2012-09-24

decode the other translated string for "at" (LP: #1055762)

[Sebastien Bacher (seb128)]

looks good to me and confirmed to work locally

review: Approve

=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
--- gwibber/microblog/plugins/facebook/__init__.py	2012-09-19 00:23:53 +0000
+++ gwibber/microblog/plugins/facebook/__init__.py	2012-09-24 20:57:24 +0000
@@ -269,9 +269,9 @@
         m["location"]["id"] = data["place"]["id"]
         m["location"]["name"] = data["place"].get("name", None)
         if m["location"]["name"]:
-          m["html"] += " " + _("at") + " <p><b>%s</b></p>" % m["location"]["name"]
+          m["html"] += " " + _("at").decode('utf8') + " <p><b>%s</b></p>" % m["location"]["name"]
           m["content"] = m["html"]
-          m["text"] += " "  + _("at") + " " + m["location"]["name"]
+          m["text"] += " "  + _("at").decode('utf8') + " " + m["location"]["name"]
         if data["place"].has_key("location"):
           m["location"]["latitude"] = data["place"]["location"].get("latitude", None)
           m["location"]["longitude"] = data["place"]["location"].get("longitude", None)