diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-22 17:08:45 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-22 17:08:45 +0300 |
| commit | 00f2a736eb555206fd76b65ca32f00cb9df9f026 (patch) | |
| tree | 5f3f704c329f7a5037e4dca067eb655b54810386 /src/mod_block_strangers.erl | |
| parent | Change Travis OTP platform from 19.1 to 19.3 (diff) | |
Improve extraction of translated strings
Now every such string MUST be encapsulated into ?T() macro.
The macro itself is defined in include/translate.hrl.
Example:
-module(foo).
-export([bar/1]).
-include("translate.hrl").
bar(Lang) ->
translate:translate(Lang, ?T("baz")).
Diffstat (limited to 'src/mod_block_strangers.erl')
| -rw-r--r-- | src/mod_block_strangers.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl index 80504c9fb..5f59978a3 100644 --- a/src/mod_block_strangers.erl +++ b/src/mod_block_strangers.erl @@ -36,6 +36,7 @@ -include("xmpp.hrl"). -include("logger.hrl"). +-include("translate.hrl"). -define(SETS, gb_sets). @@ -117,11 +118,11 @@ filter_subscription(Acc, #presence{from = From, to = To, lang = Lang, end, ejabberd_router:route(Msg); {error, limit} -> - ErrText = <<"Too many CAPTCHA requests">>, + ErrText = ?T("Too many CAPTCHA requests"), Err = xmpp:err_resource_constraint(ErrText, Lang), ejabberd_router:route_error(Pres, Err); _ -> - ErrText = <<"Unable to generate a CAPTCHA">>, + ErrText = ?T("Unable to generate a CAPTCHA"), Err = xmpp:err_internal_server_error(ErrText, Lang), ejabberd_router:route_error(Pres, Err) end, @@ -139,7 +140,7 @@ handle_captcha_result(captcha_succeed, Pres) -> Pres1 = xmpp:put_meta(Pres, captcha, passed), ejabberd_router:route(Pres1); handle_captcha_result(captcha_failed, #presence{lang = Lang} = Pres) -> - Txt = <<"The CAPTCHA verification has failed">>, + Txt = ?T("The CAPTCHA verification has failed"), ejabberd_router:route_error(Pres, xmpp:err_not_allowed(Txt, Lang)). %%%=================================================================== @@ -165,7 +166,7 @@ check_message(#message{from = From, to = To, lang = Lang} = Msg) -> end, if Drop -> - Txt = <<"Messages from strangers are rejected">>, + Txt = ?T("Messages from strangers are rejected"), Err = xmpp:err_policy_violation(Txt, Lang), Msg1 = maybe_adjust_from(Msg), ejabberd_router:route_error(Msg1, Err), |