KFSTP-1621

fix labels for generic dates, and don't use short labels if we can avoid it but add short labels in case someone wants to use them someday