refactor locale and add email list