Deduped some code and accept 'O' for french DDMMSS