shugo	2008-08-21 09:30:28 +0900 (Thu, 21 Aug 2008)

  New Revision: 18746

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18746

  Log:
    * strftime.c (rb_strftime): return "UTC" instead of "GMT".
    * test/ruby/test_time.rb (test_strftime): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/strftime.c
    trunk/test/ruby/test_time.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18745)
+++ ChangeLog	(revision 18746)
@@ -1,3 +1,9 @@
+Thu Aug 21 09:29:01 2008  Shugo Maeda  <shugo@r...>
+
+	* 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@r...>
 
 	* test/iconv/test_option.rb (test_ignore_option): skip if iconv
Index: strftime.c
===================================================================
--- strftime.c	(revision 18745)
+++ strftime.c	(revision 18746)
@@ -446,7 +446,7 @@
 
 		case 'Z':	/* time zone name or abbrevation */
 			if (gmt) {
-			    strcpy(tbuf, "GMT");
+			    strcpy(tbuf, "UTC");
 			    break;
 			}
 #ifdef HAVE_TZNAME
Index: test/ruby/test_time.rb
===================================================================
--- test/ruby/test_time.rb	(revision 18745)
+++ test/ruby/test_time.rb	(revision 18746)
@@ -371,7 +371,7 @@
     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(""))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/