Fixes for issue #45 , only use first part of locale if not english