Yes, but we agreed on `locales` _after_ the PR was created :smile: .  That's kinda why I want to get this PR merged in (if it's good) so that I can revise it while I'm implementing all those changes discussed last week.