Inconsistent locale selection in admin and user settings

I was able to dig down the PR by @joallard responsible for adding this feature.

https://github.com/discourse/discourse/pull/1922