fixup check for locale (do the right way, as opposed to looking in url)