Fixed #3; more locales added for validations