diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:38 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:38 +0000 |
| commit | 186faf3809b336c9005c456a244e796e79c7926c (patch) | |
| tree | 88f59aa45de5b09605f78ec68499652d21cc8c35 /lib | |
| parent | a7edbbe55903ce224a4e342aaa6c4e1b784bdada (diff) | |
| download | ruby-186faf3809b336c9005c456a244e796e79c7926c.tar.gz ruby-186faf3809b336c9005c456a244e796e79c7926c.tar.xz ruby-186faf3809b336c9005c456a244e796e79c7926c.zip | |
merges r20347 from trunk into ruby_1_9_1.
* lib/date/format.rb (strftime): ignores '_' flag for %[LN].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/date/format.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/date/format.rb b/lib/date/format.rb index c8bc10fba..161cf8589 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -255,6 +255,7 @@ class Date when 'j'; emit_n(yday, 3, f) when 'k'; emit_a(hour, 2, f) when 'L' + f[:p] = nil w = f[:w] || 3 u = 10**w emit_n((sec_fraction * u).floor, w, f) @@ -262,6 +263,7 @@ class Date when 'M', 'OM'; emit_n(min, 2, f) when 'm', 'Om'; emit_n(mon, 2, f) when 'N' + f[:p] = nil w = f[:w] || 9 u = 10**w emit_n((sec_fraction * u).floor, w, f) |