Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Update ejabberd.pot

This commit is contained in:
Evgeniy Khramtsov 2018-06-20 12:32:10 +03:00
parent 3a5d2dbed8
commit 446e6e6f3b
5 changed files with 1733 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2972
priv/msgs/ejabberd.pot
View File

File diff suppressed because it is too large Load Diff

2
rebar.config
View File

@ -25,7 +25,7 @@
{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.22"}}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.22"}}},
{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.11"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.11"}}},
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.30"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.30"}}},
{xmpp, ".*", {git, "https://github.com/processone/xmpp", "0259a54"}}, {xmpp, ".*", {git, "https://github.com/processone/xmpp", "5df8f4b"}},
{fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.14"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.14"}}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
{p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},

5
src/gen_iq_handler.erl
View File

@ -39,6 +39,7 @@
-include("logger.hrl"). -include("logger.hrl").
-include("xmpp.hrl"). -include("xmpp.hrl").
-include("translate.hrl").
-type component() :: ejabberd_sm | ejabberd_local. -type component() :: ejabberd_sm | ejabberd_local.
@ -87,8 +88,8 @@ handle(Component,
handle(_, #iq{type = T, lang = Lang, sub_els = SubEls} = Packet) handle(_, #iq{type = T, lang = Lang, sub_els = SubEls} = Packet)
when T == get; T == set -> when T == get; T == set ->
Txt = case SubEls of Txt = case SubEls of
[] -> <<"No child elements found">>; [] -> ?T("No child elements found");
_ -> <<"Too many child elements">> _ -> ?T("Too many child elements")
end, end,
Err = xmpp:err_bad_request(Txt, Lang), Err = xmpp:err_bad_request(Txt, Lang),
ejabberd_router:route_error(Packet, Err); ejabberd_router:route_error(Packet, Err);

4
src/mod_configure.erl
View File

@ -1091,7 +1091,7 @@ get_form(Host, [<<"config">>, <<"acls">>], Lang) ->
type = form, type = form,
fields = [?HFIELD(), fields = [?HFIELD(),
#xdata_field{type = 'text-multi', #xdata_field{type = 'text-multi',
label = ?T(Lang, <<"Access control lists">>), label = ?T(Lang, <<"Access Control Lists">>),
var = <<"acls">>, var = <<"acls">>,
values = ACLs}]}}; values = ACLs}]}};
get_form(Host, [<<"config">>, <<"access">>], Lang) -> get_form(Host, [<<"config">>, <<"access">>], Lang) ->
@ -1109,7 +1109,7 @@ get_form(Host, [<<"config">>, <<"access">>], Lang) ->
type = form, type = form,
fields = [?HFIELD(), fields = [?HFIELD(),
#xdata_field{type = 'text-multi', #xdata_field{type = 'text-multi',
label = ?T(Lang, <<"Access rules">>), label = ?T(Lang, <<"Access Rules">>),
var = <<"access">>, var = <<"access">>,
values = Accs}]}}; values = Accs}]}};
get_form(_Host, ?NS_ADMINL(<<"add-user">>), Lang) -> get_form(_Host, ?NS_ADMINL(<<"add-user">>), Lang) ->

34
tools/extract-tr.sh
View File

@ -2,21 +2,26 @@
%% -*- erlang -*- %% -*- erlang -*-
%%! -pa ebin %%! -pa ebin
main([Dir]) -> main(Dirs) ->
Txts = Txts =
filelib:fold_files( lists:foldl(
Dir, ".+\.beam\$", false, fun(Dir, Acc) ->
fun(BeamFile, Res) -> EbinDir = filename:join(Dir, "ebin"),
Mod = mod(BeamFile), SrcDir = filename:join(Dir, "src"),
ErlFile = filename:join("src", Mod ++ ".erl"), filelib:fold_files(
case get_forms(BeamFile, ErlFile) of EbinDir, ".+\.beam\$", false,
{ok, BeamForms, ErlForms} -> fun(BeamFile, Res) ->
process_forms(BeamForms, Mod, application) ++ Mod = mod(BeamFile),
process_forms(ErlForms, Mod, macro) ++ Res; ErlFile = filename:join(SrcDir, Mod ++ ".erl"),
_Err -> case get_forms(BeamFile, ErlFile) of
Res {ok, BeamForms, ErlForms} ->
end process_forms(BeamForms, Mod, application) ++
end, []), process_forms(ErlForms, Mod, macro) ++ Res;
_Err ->
Res
end
end, Acc)
end, [], Dirs),
Dict = lists:foldl( Dict = lists:foldl(
fun({B, Meta}, Acc) -> fun({B, Meta}, Acc) ->
dict:update( dict:update(
@ -137,6 +142,7 @@ analyze_app(Form, Mod) ->
{xmpp, "err_" ++ _, 2, [T|_]} -> T; {xmpp, "err_" ++ _, 2, [T|_]} -> T;
{xmpp, "serr_" ++ _, 2, [T|_]} -> T; {xmpp, "serr_" ++ _, 2, [T|_]} -> T;
{xmpp, "mk_text", 2, [T|_]} -> T; {xmpp, "mk_text", 2, [T|_]} -> T;
{xmpp_tr, "tr", 2, [_,T|_]} -> T;
{translate, "translate", 2, [_,T|_]} -> T {translate, "translate", 2, [_,T|_]} -> T
end, end,
Pos = erl_syntax:get_pos(Txt), Pos = erl_syntax:get_pos(Txt),