diff options
author | Jim Meyering <jim@meyering.net> | 2000-11-18 19:43:15 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2000-11-18 19:43:15 +0000 |
commit | e5aacbc6ea5b2f39ce10669d4c206431683cf303 (patch) | |
tree | 88736208b414af0dc0a27855f806f1d7c6fb7efe /src | |
parent | 909f49e65156659ace11bdbe1a8c2e563732f6fa (diff) | |
download | coreutils-e5aacbc6ea5b2f39ce10669d4c206431683cf303.tar.xz |
Revert change of 2000-11-11. It inadvertently change
the output format of `ls -l --full-time'.
Diffstat (limited to 'src')
-rw-r--r-- | src/ls.c | 16 |
1 files changed, 3 insertions, 13 deletions
@@ -114,15 +114,6 @@ int wcwidth (); # endif #endif -#if HAVE_LANGINFO_H -# include <langinfo.h> -#endif -#ifdef _DATE_FMT -# define DATE_FMT_LANGINFO() nl_langinfo (_DATE_FMT) -#else -# define DATE_FMT_LANGINFO() "" -#endif - #include "system.h" #include <fnmatch.h> @@ -2379,8 +2370,7 @@ print_long_format (const struct fileinfo *f) if (full_time) { - char *date_fmt = DATE_FMT_LANGINFO (); - fmt = *date_fmt ? date_fmt : "%a %b %e %H:%M:%S %Z %Y"; + fmt = _("%a %b %d %H:%M:%S %Y"); } else { @@ -2393,11 +2383,11 @@ print_long_format (const struct fileinfo *f) Allow a 1 hour slop factor for what is considered "the future", to allow for NFS server/client clock disagreement. Show the year instead of the time of day. */ - fmt = "%b %e %Y"; + fmt = _("%b %e %Y"); } else { - fmt = "%b %e %H:%M"; + fmt = _("%b %e %H:%M"); } } |