mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
Make the %r format directive honor any locale setting.
(my_strftime) [!defined _NL_CURRENT && HAVE_STRFTIME]: Use underlying_strftime for %r.
This commit is contained in:
1 parent
95fa743ec4
commit
efc545bd54
1 file changed
+6
-2
+6
-2
@@ -1171,13 +1171,17 @@ my_strftime (s, maxsize, format, tp extra_args LOCALE_PARAM)
|
||||
goto subformat;
|
||||
|
||||
case L_('r'):
|
||||
#ifdef _NL_CURRENT
|
||||
#if !defined _NL_CURRENT && HAVE_STRFTIME
|
||||
goto underlying_strftime;
|
||||
#else
|
||||
# ifdef _NL_CURRENT
|
||||
if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
|
||||
NLW(T_FMT_AMPM)))
|
||||
== L_('\0'))
|
||||
#endif
|
||||
# endif
|
||||
subfmt = L_("%I:%M:%S %p");
|
||||
goto subformat;
|
||||
#endif
|
||||
|
||||
case L_('S'):
|
||||
if (modifier == L_('E'))
|
||||
|
||||
Reference in new issue
Block a user