clean up locales and fix loacel.js so that we only use languageCode-countryCode