umgeher/erlware_commons
0
Fork 0
Code Issues Pull requests Releases Activity

Fix for 12am and 12pm.

Browse source 
12am should be hour 0, 12pm should be hour 12.

Signed-off-by: Eric Merritt <ericbmerritt@gmail.com>
This commit is contained in:
Jesse Gumm 2012-03-23 02:18:50 -05:00 • committed by Eric Merritt
parent 23de64a3cd
commit 30184d4f77
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ec_date.erl
View file

@ -247,7 +247,9 @@ tokenise([Else | Rest], Acc) ->
tokenise(Rest, [{bad_token, Else} | Acc]). tokenise(Rest, [{bad_token, Else} | Acc]).
hour(Hour, []) -> Hour; hour(Hour, []) -> Hour;
hour(12, [am]) -> 0;
hour(Hour, [am]) -> Hour; hour(Hour, [am]) -> Hour;
hour(12, [pm]) -> 12;
hour(Hour, [pm]) -> Hour+12. hour(Hour, [pm]) -> Hour+12.
-spec format(string(),datetime(),list()) -> string(). -spec format(string(),datetime(),list()) -> string().
@ -541,6 +543,10 @@ basic_parse_test_() ->
parse("1:15", ?DATE)), parse("1:15", ?DATE)),
?_assertEqual({{2001,3,10}, {1,15,0}}, ?_assertEqual({{2001,3,10}, {1,15,0}},
parse("1:15 am", ?DATE)), parse("1:15 am", ?DATE)),
?_assertEqual({{2001,3,10}, {0,15,0}},
parse("12:15 am", ?DATE)),
?_assertEqual({{2001,3,10}, {12,15,0}},
parse("12:15 pm", ?DATE)),
?_assertEqual({{2001,3,10}, {3,45,39}}, ?_assertEqual({{2001,3,10}, {3,45,39}},
parse("3:45:39", ?DATE)), parse("3:45:39", ?DATE)),
?_assertEqual({{1963,4,23}, {17,16,17}}, ?_assertEqual({{1963,4,23}, {17,16,17}},