Fix calendar and locale in dateFromString