Fixing language setting to include country code

This addresses #210