Bugfix/fixed arabic months

This is the same as #667, but I added a cleanup commit at the end.