Make default locale configurable
changes to make use of LocaleHelper class