Supporting A.M. and P.M. and moving isPM check to Language

Based on comments in #773.