diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-25 04:42:11 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-25 04:42:11 +0000 |
| commit | a689e57283121d1e3ab2a9697459839828317b17 (patch) | |
| tree | 709faba8fee12abd43ad88b41c09943b84c70034 | |
| parent | 15b183c218d488f25567cf126cb379524966746c (diff) | |
* strftime.c (rb_strftime): "%^P" should convert to upper case.
[ruby-dev:37180]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | strftime.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Nov 25 10:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * strftime.c (rb_strftime): "%^P" should convert to upper case. + [ruby-dev:37180] + Tue Nov 25 07:51:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d". diff --git a/strftime.c b/strftime.c index 98e193c396..5002c56c06 100644 --- a/strftime.c +++ b/strftime.c @@ -404,7 +404,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept case 'p': /* AM or PM based on 12-hour clock */ case 'P': /* am or pm based on 12-hour clock */ if ((*format == 'p' && (flags & BIT_OF(CHCASE))) || - (*format == 'P' && !(flags & BIT_OF(CHCASE)))) { + (*format == 'P' && !(flags & (BIT_OF(CHCASE)|BIT_OF(UPPER))))) { flags &= ~(BIT_OF(UPPER)|BIT_OF(CHCASE)); flags |= BIT_OF(LOWER); } |