aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2014-04-15 16:16:12 +0200
committerBadlop <badlop@process-one.net>2014-04-15 17:05:22 +0200
commitd97b4fd9ca36858a12bc5e6841334cde4c8f0431 (patch)
tree6c216b4c99fd74eabf5651053966ede38f2deda7
parentMerge pull request #160 from runcom/protocol_options (diff)
Fix loading translation files on R17
-rw-r--r--src/translate.erl75
1 files changed, 48 insertions, 27 deletions
diff --git a/src/translate.erl b/src/translate.erl
index 10199f648..758784f18 100644
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -76,33 +76,54 @@ load_dir(Dir) ->
end.
load_file(Lang, File) ->
- case file:consult(File) of
- {ok, Terms} ->
- lists:foreach(fun ({Orig, Trans}) ->
- Trans1 = case Trans of
- <<"">> -> Orig;
- _ -> Trans
- end,
- ets:insert(translations,
- {{Lang, iolist_to_binary(Orig)},
- iolist_to_binary(Trans1)})
- end,
- Terms);
- %% Code copied from ejabberd_config.erl
- {error,
- {_LineNumber, erl_parse, _ParseMessage} = Reason} ->
- ExitText = iolist_to_binary([File,
- " approximately in the line ",
- file:format_error(Reason)]),
- ?ERROR_MSG("Problem loading translation file ~n~s",
- [ExitText]),
- exit(ExitText);
- {error, Reason} ->
- ExitText = iolist_to_binary([File, ": ",
- file:format_error(Reason)]),
- ?ERROR_MSG("Problem loading translation file ~n~s",
- [ExitText]),
- exit(ExitText)
+ case file:open(File, [read]) of
+ {ok, Fd} ->
+ epp:set_encoding(Fd, latin1),
+ load_file_loop(Fd, 1, File, Lang),
+ file:close(Fd);
+ Error ->
+ ExitText = iolist_to_binary([File, ": ",
+ file:format_error(Error)]),
+ ?ERROR_MSG("Problem loading translation file ~n~s",
+ [ExitText]),
+ exit(ExitText)
+ end.
+
+load_file_loop(Fd, Line, File, Lang) ->
+ case io:read(Fd, '', Line) of
+ {ok,{Orig, Trans}, NextLine} ->
+ Trans1 = case Trans of
+ <<"">> -> Orig;
+ _ -> Trans
+ end,
+ ets:insert(translations,
+ {{Lang, iolist_to_binary(Orig)},
+ iolist_to_binary(Trans1)}),
+
+ load_file_loop(Fd, NextLine, File, Lang);
+ {ok,_, _NextLine} ->
+ ExitText = iolist_to_binary([File,
+ " approximately in the line ",
+ Line]),
+ ?ERROR_MSG("Problem loading translation file ~n~s",
+ [ExitText]),
+ exit(ExitText);
+ {error,
+ {_LineNumber, erl_parse, _ParseMessage} = Reason} ->
+ ExitText = iolist_to_binary([File,
+ " approximately in the line ",
+ file:format_error(Reason)]),
+ ?ERROR_MSG("Problem loading translation file ~n~s",
+ [ExitText]),
+ exit(ExitText);
+ {error, Reason} ->
+ ExitText = iolist_to_binary([File, ": ",
+ file:format_error(Reason)]),
+ ?ERROR_MSG("Problem loading translation file ~n~s",
+ [ExitText]),
+ exit(ExitText);
+ {eof,_Line} ->
+ ok
end.
-spec translate(binary(), binary()) -> binary().