Handle non-english default languages

Fixes #584