check locale before use
Merge branch 'issue-24' into develop