Internationalization Setup (Update)

[Pivotal Tracker](https://www.pivotaltracker.com/story/show/67496894)

* Intelligently handle `html_safe` translations
* Included test for new logic