Fix for issue 568: Not possible to set custom language whose locale
consists of language AND country (e.g. es-AR, zh_CN)
Merge pull request #354 from Prom42/develop

Fix for issue 568: Language selection issue