summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 14:55:22 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 14:55:22 +0000
commitc121f78b9a5e264c4817fe99320a18d58c007bb7 (patch)
tree5aca8e082d65480780af92ecd23be2226df09b84
parent5e795ef8f6bf38d97188b989b0f6e46a66b63c57 (diff)
* strftime.c: %l should be 1..12 instead of 0..12 [ruby-core:27072]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--strftime.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1982f4cd58..5b72a4282b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 6 23:50:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * strftime.c: %l should be 1..12 instead of 0..12 [ruby-core:27072]
+
Sun Dec 6 23:16:35 2009 Tanaka Akira <akr@fsij.org>
* lib/find.rb (Find.find): reduce stat system call.
diff --git a/strftime.c b/strftime.c
index 0ffe6f2bbe..db6591b77d 100644
--- a/strftime.c
+++ b/strftime.c
@@ -1164,7 +1164,7 @@ static char *array[] =
"(%%h) should be same as (%%b) %h",
"(%%j) day of the year (001..366) %j",
"(%%k) hour, 24-hour clock, blank pad ( 0..23) %k",
- "(%%l) hour, 12-hour clock, blank pad ( 0..12) %l",
+ "(%%l) hour, 12-hour clock, blank pad ( 1..12) %l",
"(%%m) month (01..12) %m",
"(%%p) locale's AM or PM based on 12-hour clock %p",
"(%%r) time, 12-hour (same as %%I:%%M:%%S %%p) %r",