Address in GMaps popup not following configured display format or translated

On the event info page, the event address which appears above the map appears in the display format configured. However, when I click on the marker on the map, the format is different. First of all it displays the state abbreviation - which makes no sense for Ireland where we need the full state name, and then the state abbreviation / country aren't translated.

The attached patch swaps out the manual building of the address string to use CRM_Core_BAO_Location functions instead. I haven't looked at contacts yet, but this fixes it for events