Get the FormatDateRange tests passing again.

This fixes a few places that were accidentally using the wrong numbered
parameter in the format call.  It also makes other adjustments so that
the formats for English are exactly the same as they were in Cupcake.