summaryrefslogtreecommitdiffstats
path: root/time.c
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-28 17:06:20 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-28 17:06:20 +0000
commit642ea67a0162c002a1dc7ab6b10b944e61f0b3d3 (patch)
treeb1691c2811825b84b9da5fd326abcc0d2034dd54 /time.c
parent45011ce00bc0f9b0ac6523b314eb7772c2422eb6 (diff)
downloadruby-642ea67a0162c002a1dc7ab6b10b944e61f0b3d3.tar.gz
ruby-642ea67a0162c002a1dc7ab6b10b944e61f0b3d3.tar.xz
ruby-642ea67a0162c002a1dc7ab6b10b944e61f0b3d3.zip
* strftime.c (rb_strftime): supported %s and %P.
* time.c (time_strftime): ditto. * test/ruby/test_time.rb (test_strftime): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/time.c b/time.c
index b111bca64..e54c65505 100644
--- a/time.c
+++ b/time.c
@@ -2091,6 +2091,8 @@ rb_strftime_alloc(char **buf, const char *format,
* %6N microsecond (6 digits)
* %9N nanosecond (9 digits)
* %p - Meridian indicator (``AM'' or ``PM'')
+ * %P - Meridian indicator (``am'' or ``pm'')
+ * %s - Number of seconds since 1970-01-01 00:00:00 UTC.
* %S - Second of the minute (00..60)
* %U - Week number of the current year,
* starting with the first Sunday as the first