Added getLocale()
cleaned code
Merge branch 'feature/test-user-locale' into develop