Fixed problems with currenLocale,

not sure about the repetition part.