fix bug: locale links was not working
Merge branch 'master' into design