From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 10 Jul 2019 21:13:39 +0000 (+0300)
Subject: Improve previous commit
X-Git-Tag: 19.08~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19cbbf69b278c18fed15e5887cc2bf95de295230;p=ejabberd

Improve previous commit
---

diff --git a/src/translate.erl b/src/translate.erl
index 12d5b6c04..2c277c5da 100644
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -147,10 +147,12 @@ load_file(File) ->
 	{ok, Lines} ->
 	    lists:map(
 	      fun({In, Out}) ->
-		      try
-			  InB = unicode:characters_to_binary(In, utf8),
-			  OutB = unicode:characters_to_binary(Out, utf8),
-			  {{Lang, InB}, OutB}
+		      try {unicode:characters_to_binary(In, utf8),
+			   unicode:characters_to_binary(Out, utf8)} of
+			  {InB, OutB} when is_binary(InB), is_binary(OutB) ->
+			      {{Lang, InB}, OutB};
+			  _ ->
+			      {error, File, bad_encoding}
 		      catch _:badarg ->
 			      {error, File, bad_encoding}
 		      end;