Fix bugs for some locales!

This changes fix some bugs for locales like **pt_BR**, **es_ES** and **ru**!
This is a continuation of the issue #3694