change order of value in setlocale function
Merge branch 'master' of github.com:thelia/admin