From f0a1839fe7efb47aea6e8fcaf0e35ad3dff4187d Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 30 Nov 2008 09:23:14 +0000 Subject: merges r20353 from trunk into ruby_1_9_1. * strftime.c (rb_strftime): "%^P" should convert to upper case. [ruby-dev:37180] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ strftime.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d0a3f1545..1b7bcbd02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 25 10:35:29 2008 Yukihiro Matsumoto + + * strftime.c (rb_strftime): "%^P" should convert to upper case. + [ruby-dev:37180] + Tue Nov 25 07:51:18 2008 Yukihiro Matsumoto * strftime.c (FMT): use "%0d" formatter for zero padding, not "%.d". diff --git a/strftime.c b/strftime.c index 98e193c39..5002c56c0 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); } -- cgit