Locales refactoring
Merge branch 'feature/courses_check_62' into staging