diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-21 00:30:28 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-21 00:30:28 +0000 |
| commit | 9b4d4a8a4826e13cc8794b6a478b4a58504b126f (patch) | |
| tree | b72e1f3aaa227e53e6d6d556ac62f450204fcd04 | |
| parent | 0cae739f2d3038d8d2ac6e8ee51a9a4d926dc9d5 (diff) | |
| download | ruby-9b4d4a8a4826e13cc8794b6a478b4a58504b126f.tar.gz | |
* strftime.c (rb_strftime): return "UTC" instead of "GMT".
* test/ruby/test_time.rb (test_strftime): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | strftime.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_time.rb | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Aug 21 09:29:01 2008 Shugo Maeda <shugo@ruby-lang.org> + + * strftime.c (rb_strftime): return "UTC" instead of "GMT". + + * test/ruby/test_time.rb (test_strftime): ditto. + Thu Aug 21 07:59:04 2008 NARUSE, Yui <naruse@ruby-lang.org> * test/iconv/test_option.rb (test_ignore_option): skip if iconv diff --git a/strftime.c b/strftime.c index 86284191c2..28c9527140 100644 --- a/strftime.c +++ b/strftime.c @@ -446,7 +446,7 @@ rb_strftime(char *s, size_t maxsize, const char *format, const struct tm *timept case 'Z': /* time zone name or abbrevation */ if (gmt) { - strcpy(tbuf, "GMT"); + strcpy(tbuf, "UTC"); break; } #ifdef HAVE_TZNAME diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 049693037d..a84cbd9ec6 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -371,7 +371,7 @@ class TestTime < Test::Unit::TestCase assert_equal("00:00:00", T2000.strftime("%X")) assert_equal("00", T2000.strftime("%y")) assert_equal("2000", T2000.strftime("%Y")) - assert(["GMT", "UTC"].include?(T2000.strftime("%Z"))) + assert_equal("UTC", T2000.strftime("%Z")) assert_equal("%", T2000.strftime("%%")) assert_equal("", T2000.strftime("")) |