Fixed the Locale issues.
It does not work exactly as 1.7 since in 1.6 Locale has no calendar
information.