added correct locale handling on front end