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

Merge pull request #5 from mrallen1/binary_tz

Browse source 
Support setting binary string timezones
This commit is contained in:
Jesse Gumm 2013-09-18 09:25:22 -07:00
commit 25442e0f74
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/qdate.erl
View file

@ -343,9 +343,14 @@ date_tz_to_tz(Date, FromTZ, ToTZ) ->
ActualToTZ = ensure_timezone(ToTZ), ActualToTZ = ensure_timezone(ToTZ),
localtime:local_to_local(Date,FromTZ,ActualToTZ). localtime:local_to_local(Date,FromTZ,ActualToTZ).
set_timezone(TZ) when is_binary(TZ) ->
set_timezone(binary_to_list(TZ));
set_timezone(TZ) -> set_timezone(TZ) ->
qdate_srv:set_timezone(TZ). qdate_srv:set_timezone(TZ).
set_timezone(Key,TZ) when is_binary(TZ) ->
set_timezone(Key, binary_to_list(TZ));
set_timezone(Key,TZ) -> set_timezone(Key,TZ) ->
qdate_srv:set_timezone(Key, TZ). qdate_srv:set_timezone(Key, TZ).
@ -447,7 +452,7 @@ floor(N) when N < 0 ->
%% emulates as if a forum-type website has a Site tz, and a user-specified tz %% emulates as if a forum-type website has a Site tz, and a user-specified tz
-define(SITE_TZ,"PST"). -define(SITE_TZ,"PST").
-define(USER_TZ,"CST"). -define(USER_TZ,<<"CST">>).
-define(SELF_TZ,"EST"). %% Self will be the pid of the current running process -define(SELF_TZ,"EST"). %% Self will be the pid of the current running process
-define(SITE_KEY,test_site_key). -define(SITE_KEY,test_site_key).
-define(USER_KEY,test_user_key). -define(USER_KEY,test_user_key).
@ -486,9 +491,11 @@ test_deterministic_parser(_) ->
tz_tests(_) -> tz_tests(_) ->
{inorder,[ {inorder,[
?_assertEqual(ok,set_timezone(<<"Europe/Moscow">>)),
?_assertEqual("Europe/Moscow", get_timezone()),
?_assertEqual(ok,set_timezone(?SELF_TZ)), ?_assertEqual(ok,set_timezone(?SELF_TZ)),
?_assertEqual(?SELF_TZ,get_timezone()), ?_assertEqual(?SELF_TZ,get_timezone()),
?_assertEqual(?USER_TZ,get_timezone(?USER_KEY)), ?_assertEqual("CST",get_timezone(?USER_KEY)),
?_assertEqual(?SITE_TZ,get_timezone(?SITE_KEY)), ?_assertEqual(?SITE_TZ,get_timezone(?SITE_KEY)),
?_assertEqual({{2013,3,7},{0,0,0}}, to_date(?USER_KEY,"3/7/2013 1:00am EST")), ?_assertEqual({{2013,3,7},{0,0,0}}, to_date(?USER_KEY,"3/7/2013 1:00am EST")),
?_assertEqual({{2013,3,7},{0,0,0}}, to_date(?SITE_KEY,"3/7/2013 3:00am EST")), ?_assertEqual({{2013,3,7},{0,0,0}}, to_date(?SITE_KEY,"3/7/2013 3:00am EST")),