Add dynamic type entries in Solr config for as many country-based locales as we can, pointing to the same type as the language-based locale:

A possible variation of this is to programmatically do this: when a new locale is added to the preferences we can use the Solr API to check if there are corresponding dynamicField entries defined and if not create them based on the closest parent locale.