Correctly implement locale/country selection

Signed-off-by: Simon Busch <morphis@gravedo.de>