Skip to content

Commit

Permalink
Make %v strftime flag use uppercase month
Browse files Browse the repository at this point in the history
%v is supposed to be the VMS date, and VMS date format uses an
uppercase month.

Ruby 1.8 used an uppercase month for %v, but the behavior was
changed without explanation in r31672.

Time#strftime still uses an uppercase month for %v, so this change
makes Date#strftime consistent with Time#strftime.

Fixes [Bug #13810]
  • Loading branch information
jeremyevans committed Sep 13, 2021
1 parent 0e11517 commit 56c489f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ext/date/date_core.c
Expand Up @@ -6900,7 +6900,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
* %c - date and time (%a %b %e %T %Y)
* %D - Date (%m/%d/%y)
* %F - The ISO 8601 date format (%Y-%m-%d)
* %v - VMS date (%e-%b-%Y)
* %v - VMS date (%e-%^b-%Y)
* %x - Same as %D
* %X - Same as %T
* %r - 12-hour time (%I:%M:%S %p)
Expand Down Expand Up @@ -8380,7 +8380,7 @@ dt_lite_to_s(VALUE self)
* %c - date and time (%a %b %e %T %Y)
* %D - Date (%m/%d/%y)
* %F - The ISO 8601 date format (%Y-%m-%d)
* %v - VMS date (%e-%b-%Y)
* %v - VMS date (%e-%^b-%Y)
* %x - Same as %D
* %X - Same as %T
* %r - 12-hour time (%I:%M:%S %p)
Expand Down
2 changes: 1 addition & 1 deletion ext/date/date_strftime.c
Expand Up @@ -393,7 +393,7 @@ date_strftime_with_tmx(char *s, const size_t maxsize, const char *format,
continue;

case 'v':
STRFTIME("%e-%b-%Y");
STRFTIME("%e-%^b-%Y");
continue;

case 'w': /* weekday, Sunday == 0, 0 - 6 */
Expand Down
2 changes: 1 addition & 1 deletion test/date/test_date_strftime.rb
Expand Up @@ -48,7 +48,7 @@ class TestDateStrftime < Test::Unit::TestCase
'%t'=>["\t",{}],
'%u'=>['6',{:cwday=>6}],
'%V'=>['05',{:cweek=>5}],
'%v'=>[' 3-Feb-2001',{:mday=>3,:mon=>2,:year=>2001}],
'%v'=>[' 3-FEB-2001',{:mday=>3,:mon=>2,:year=>2001}],
'%z'=>['+0000',{:zone=>'+0000',:offset=>0}],
'%+'=>['Sat Feb 3 00:00:00 +00:00 2001',
{:wday=>6,:mon=>2,:mday=>3,
Expand Down

0 comments on commit 56c489f

Please sign in to comment.