From 5770946f03ba669ea867b787fbd546333a8a3814 Mon Sep 17 00:00:00 2001 From: Evgeny Khramtsov Date: Mon, 23 Sep 2019 15:17:20 +0300 Subject: Correctly handle unicode in log messages --- src/pubsub_subscription_sql.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pubsub_subscription_sql.erl') diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl index af31008be..9419545df 100644 --- a/src/pubsub_subscription_sql.erl +++ b/src/pubsub_subscription_sql.erl @@ -171,13 +171,13 @@ val_xfield(digest_frequency = Opt, [Val]) -> case catch binary_to_integer(Val) of N when is_integer(N) -> N; _ -> - Txt = {?T("Value of '~s' should be integer"), [Opt]}, + Txt = {?T("Value of '~ts' should be integer"), [Opt]}, {error, xmpp:err_not_acceptable(Txt, ejabberd_option:language())} end; val_xfield(expire = Opt, [Val]) -> try xmpp_util:decode_timestamp(Val) catch _:{bad_timestamp, _} -> - Txt = {?T("Value of '~s' should be datetime string"), [Opt]}, + Txt = {?T("Value of '~ts' should be datetime string"), [Opt]}, {error, xmpp:err_not_acceptable(Txt, ejabberd_option:language())} end; val_xfield(include_body = Opt, [Val]) -> xopt_to_bool(Opt, Val); @@ -189,7 +189,7 @@ val_xfield(subscription_depth = Opt, [Depth]) -> case catch binary_to_integer(Depth) of N when is_integer(N) -> N; _ -> - Txt = {?T("Value of '~s' should be integer"), [Opt]}, + Txt = {?T("Value of '~ts' should be integer"), [Opt]}, {error, xmpp:err_not_acceptable(Txt, ejabberd_option:language())} end. @@ -199,7 +199,7 @@ xopt_to_bool(_, <<"1">>) -> true; xopt_to_bool(_, <<"false">>) -> false; xopt_to_bool(_, <<"true">>) -> true; xopt_to_bool(Option, _) -> - Txt = {?T("Value of '~s' should be boolean"), [Option]}, + Txt = {?T("Value of '~ts' should be boolean"), [Option]}, {error, xmpp:err_not_acceptable(Txt, ejabberd_option:language())}. %% Return a field for an XForm for Key, with data filled in, if -- cgit v1.2.3