edx/edx-platform — pull request #2432 by dianakhuang (2014-02-03 17:36:43+00:00)
Title: Clean up strings in the ErrorModule

1) Refactor code slightly so that we're only setting a default `error_msg` at the very end if we don't already have one.
2) Remove a confusing and unused `display_name` that has untranslated string

@nedbat @sarina ?