aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_service.erl
diff options
context:
space:
mode:
authorEvgeny Khramtsov <ekhramtsov@process-one.net>2019-06-22 17:08:45 +0300
committerEvgeny Khramtsov <ekhramtsov@process-one.net>2019-06-22 17:08:45 +0300
commit00f2a736eb555206fd76b65ca32f00cb9df9f026 (patch)
tree5f3f704c329f7a5037e4dca067eb655b54810386 /src/ejabberd_service.erl
parentChange 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 '')
-rw-r--r--src/ejabberd_service.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index 2710422a5..8e29577c8 100644
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -37,6 +37,7 @@
-include("xmpp.hrl").
-include("logger.hrl").
+-include("translate.hrl").
-type state() :: xmpp_stream_in:state().
-export_type([state/0]).
@@ -119,7 +120,7 @@ handle_stream_start(_StreamStart,
host_opts := HostOpts} = State) ->
case ejabberd_router:is_my_host(RemoteServer) of
true ->
- Txt = <<"Unable to register route on existing local domain">>,
+ Txt = ?T("Unable to register route on existing local domain"),
xmpp_stream_in:send(State, xmpp:serr_conflict(Txt, Lang));
false ->
NewHostOpts = case dict:is_key(RemoteServer, HostOpts) of
@@ -198,7 +199,7 @@ handle_authenticated_packet(Pkt0, #{ip := {IP, _}, lang := Lang} = State)
end,
State2;
false ->
- Txt = <<"Improper domain part of 'from' attribute">>,
+ Txt = ?T("Improper domain part of 'from' attribute"),
Err = xmpp:serr_invalid_from(Txt, Lang),
xmpp_stream_in:send(State, Err)
end;
@@ -211,7 +212,7 @@ handle_info({route, Packet}, #{access := Access} = State) ->
xmpp_stream_in:send(State, Packet);
deny ->
Lang = xmpp:get_lang(Packet),
- Err = xmpp:err_not_allowed(<<"Access denied by service policy">>, Lang),
+ Err = xmpp:err_not_allowed(?T("Access denied by service policy"), Lang),
ejabberd_router:route_error(Packet, Err),
State
end;