Regularize the locale code
Merge pull request #2638 from gittip/improve-i18n

Regularize the locale code