Normalize language identifiers as described in #963
Merge pull request #985 from ichernev/feature/normalize-lang-codes

Normalize language identifiers as described in #963