Hook the 12- or 24-hour time format checkbox back up.

The format strings are newly generated from CLDR.  The code is once again
the same as in cupcake: do the natural thing for the locale if the user
has never specified, but follow the checkbox if the user has ever set it.