Fix bug 930485: Only select country from country locales.

'pt-BR' indicates country, but 'fr' does not. And some language
codes do not correspond to a country code that makes sense, as
in this bug with Sierra Leone.
Merge pull request #1394 from pmclanahan/no-country-locale-select-newsletter-930485

Fix bug 930485: Only select country from country locales.