1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2008-08-22 10:55:48 +00:00
parent 760ee4ec04
commit 1acc8f9483
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/date/format.rb
View File

@ -153,8 +153,8 @@ class Date
s[0,0] = sign s[0,0] = sign
end end
if f[:w] if f[:p] != '-'
s = f[:n] ? s.ljust(f[:w], f[:p]) : s.rjust(f[:w], f[:p]) s = s.rjust(f[:w], f[:p])
end end
if f[:s] && f[:p] != "\s" if f[:s] && f[:p] != "\s"
@ -257,18 +257,12 @@ class Date
when 'j'; emit_n(yday, 3, f) when 'j'; emit_n(yday, 3, f)
when 'k'; emit_a(hour, 2, f) when 'k'; emit_a(hour, 2, f)
when 'L' when 'L'
f[:n] = true emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f)
w = f[:w]
s = emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f)
w ? s[0, w] : s
when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f) when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
when 'M', 'OM'; emit_n(min, 2, f) when 'M', 'OM'; emit_n(min, 2, f)
when 'm', 'Om'; emit_n(mon, 2, f) when 'm', 'Om'; emit_n(mon, 2, f)
when 'N' when 'N'
f[:n] = true emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f)
w = f[:w]
s = emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f)
w ? s[0, w] : s
when 'n'; "\n" when 'n'; "\n"
when 'P'; emit_ad(strftime('%p').downcase, 0, f) when 'P'; emit_ad(strftime('%p').downcase, 0, f)
when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f) when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)