* src/translate.erl: When a translation file can't be loaded, show

detailed error message

SVN Revision: 1669

diff --git a/ChangeLog b/ChangeLog
index f5e2a385359a28230edfa6300b52e9237267b71f..b6812ccfdc911137bfd49087983147fcf13251d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-25  Badlop  <badlop@process-one.net>
 
+       * src/translate.erl: When a translation file can't be loaded, show
+       detailed error message
+
        * src/ejabberd_ctl.erl: If ejabberd didn't start correctly:
        'ejabberdctl status' suggests to look in log files; any other
        ejabberdctl command shows 'status'.

diff --git a/src/translate.erl b/src/translate.erl
index eddea35e38270e75957e6812d86b88a85db4cd7e..0a7d6029a143d57499d910f33863414215ac460b 100644 (file)
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -89,8 +89,16 @@ load_file(Lang, File) ->
                              ets:insert(translations,
                                             {{Lang, Orig}, Trans1})
                          end, Terms);
+        %% Code copied from ejabberd_config.erl
+       {error, {_LineNumber, erl_parse, _ParseMessage} = Reason} ->
+           ExitText = lists:flatten(File ++ " approximately in the line "
+                                    ++ file:format_error(Reason)),
+           ?ERROR_MSG("Problem loading translation file ~n~s", [ExitText]),
+           exit(ExitText);
        {error, Reason} ->
-           exit(file:format_error(Reason))
+           ExitText = lists:flatten(File ++ ": " ++ file:format_error(Reason)),
+           ?ERROR_MSG("Problem loading translation file ~n~s", [ExitText]),
+           exit(ExitText)
     end.
 
 translate(Lang, Msg) ->