Changed the way how language preference works
Merge remote-tracking branch 'plovDevGitHub/master'