From b116cb2565ba7c63306d79ec7a448337b893315b Mon Sep 17 00:00:00 2001 From: tadf Date: Sat, 6 Nov 2004 02:24:35 +0000 Subject: checks whether zone was given. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/date/format.rb | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4ee3cde5..40f804cf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 6 11:18:59 2004 Tadayoshi Funaba + + * lib/date.rb (_parse): checks whether zone was given. + Fri Nov 5 19:07:16 2004 NARUSE, Yui * ext/nkf: follow CVS Head of original nkf. diff --git a/lib/date/format.rb b/lib/date/format.rb index e8e54e789..d821ecb04 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -1,5 +1,5 @@ # format.rb: Written by Tadayoshi Funaba 1999-2004 -# $Id: format.rb,v 2.13 2004-03-20 08:05:13+09 tadf Exp $ +# $Id: format.rb,v 2.14 2004-11-06 10:58:40+09 tadf Exp $ require 'rational' @@ -276,7 +276,9 @@ class Date end end - zone = $6 + if $6 + zone = $6 + end end # eu @@ -423,7 +425,9 @@ class Date if $4 sec_fraction = $4.to_i.to_r / (10**$4.size) end - zone = $5 + if $5 + zone = $5 + end end if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ') -- cgit