Skip to content

Commit

Permalink
CallbackMod never called
Browse files Browse the repository at this point in the history
Due changes in commit 9c3122c setting
default return values for gettext_compile:get_env/1 the callback is
never called. It expects the function returns undefined.

Changed undefined to default values.
  • Loading branch information
mdaguete committed Jul 16, 2013
1 parent 2a103f9 commit c20edd2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/gettext_server.erl
Expand Up @@ -246,12 +246,12 @@ get_gettext_dir(CallBackMod, Config) ->

get_gettext_dir(CallBackMod) ->
case gettext_compile:get_env(path) of
undefined ->
try CallBackMod:gettext_dir()
catch
_:_ -> gettext_dir() % fallback
end;
Dir -> Dir
"." ->
try CallBackMod:gettext_dir()
catch
_:_ -> "." % fallback
end;
Dir -> Dir
end.

get_default_lang(CallBackMod, Config) ->
Expand All @@ -262,12 +262,12 @@ get_default_lang(CallBackMod, Config) ->

get_default_lang(CallBackMod) ->
case gettext_compile:get_env(lang) of
undefined ->
case catch CallBackMod:gettext_def_lang() of
Dir when is_list(Dir) -> Dir;
_ -> gettext_def_lang() % fallback
end;
DefLang -> DefLang
?DEFAULT_LANG ->
case catch CallBackMod:gettext_def_lang() of
Dir when is_list(Dir) -> Dir;
_ -> ?DEFAULT_LANG % fallback
end;
DefLang -> DefLang
end.

db_filename(TableName, GettextDir) ->
Expand Down

0 comments on commit c20edd2

Please sign in to comment.