Add localeChange event listener + fix non returned value issue