summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:22:38 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:22:38 +0000
commit029392bc879f70e3820bf47ceceb7bf0c9082e69 (patch)
tree88f59aa45de5b09605f78ec68499652d21cc8c35 /lib
parent2015069a204e8ba13709f94aed5e4341ea297728 (diff)
merges r20347 from trunk into ruby_1_9_1.
* lib/date/format.rb (strftime): ignores '_' flag for %[LN]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/date/format.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/date/format.rb b/lib/date/format.rb
index c8bc10fbac..161cf85891 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)