Split out language code formatting from filename generating

Signed-off-by: Michal Čihař <michal@cihar.com>
Fix two spelling errors.
Merge pull request #502 from nblock/spelling

Fix two spelling errors.
Merge branch 'master' into bootstrap