From d74a483ee4e11597b68525b39c2be25f18134edc Mon Sep 17 00:00:00 2001 From: Jason Fertel Date: Thu, 5 Nov 2015 14:31:59 -0500 Subject: [PATCH] seconds including fraction used scientific notation if less then 1e-4 --- date.lua | 4 ++-- spec/date_spec.lua | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/date.lua b/date.lua index f035ab8..14aa475 100644 --- a/date.lua +++ b/date.lua @@ -598,8 +598,8 @@ -- Misc -- -- Year, if year is in BCE, prints the BCE Year representation, otherwise result is similar to "%Y" (1 BCE, 40 BCE) ['%\b']=function(self) local x = self:getyear() return fmt("%.4d%s", x>0 and x or (-x+1), x>0 and "" or " BCE") end, - -- Seconds including fraction (59.998, 01.123) - ['%\f']=function(self) local x = self:getfracsec() return fmt("%s%.9g",x >= 10 and "" or "0", x) end, + -- Seconds including fraction (59.998, 01.123) + ['%\f']=function(self) local x = self:getfracsec() return fmt("%s%.9f",x >= 10 and "" or "0", x) end, -- percent character % ['%%']=function(self) return "%" end, -- Group Spec -- diff --git a/spec/date_spec.lua b/spec/date_spec.lua index 945e859..716b2aa 100644 --- a/spec/date_spec.lua +++ b/spec/date_spec.lua @@ -180,6 +180,9 @@ describe("Testing the 'date' module", function() assert(d:fmt('%T') == d:fmt("%H:%M:%S")) -- 24-hour time, from 00:00:00 (06:55:15) assert(d:fmt('%a %A %b %B') == "Tue Tuesday Oct October") assert(d:fmt('%C %d') == "15 05", d:fmt('%C %d')) + local d2 = date(1446747300.00008) + assert.is.equals(d2:fmt('%\f'),"00.000080109") + end) it("Tests 'getclockhour()'", function()