Fixed #1594
Added more i18n tests
Merge pull request #1676 from littlepea/develop

Fixes #1594