support user locale
fixed last commit