Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Fix some English strings

Browse Source
This commit is contained in:
Badlop 2010-11-19 13:44:30 +01:00
parent 76ca7ae7f0
commit 9b88fd6646
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_c2s.erl
View File

@ -1787,7 +1787,7 @@ check_privacy_route(From, StateData, FromRoute, To, Packet) ->
case privacy_check_packet(StateData, From, To, Packet, out) of case privacy_check_packet(StateData, From, To, Packet, out) of
deny -> deny ->
Lang = StateData#state.lang, Lang = StateData#state.lang,
ErrText = "Routing of this stanza was denied by your active privacy list", ErrText = "Your active privacy list has denied the routing of this stanza.",
Err = jlib:make_error_reply(Packet, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)), Err = jlib:make_error_reply(Packet, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)),
ejabberd_router:route(To, From, Err), ejabberd_router:route(To, From, Err),
ok; ok;

2
src/mod_muc/mod_muc.erl
View File

@ -708,7 +708,7 @@ iq_get_register_info(Host, From, Lang) ->
[{xmlelement, "instructions", [], [{xmlelement, "instructions", [],
[{xmlcdata, [{xmlcdata,
translate:translate( translate:translate(
Lang, "You need an x:data capable client to register nickname")}]}, Lang, "You need a client that supports x:data to register the nickname")}]},
{xmlelement, "x", {xmlelement, "x",
[{"xmlns", ?NS_XDATA}], [{"xmlns", ?NS_XDATA}],
[{xmlelement, "title", [], [{xmlelement, "title", [],

8
src/mod_register.erl
View File

@ -188,7 +188,7 @@ process_iq(From, To,
IQ#iq{type = error, IQ#iq{type = error,
sub_el = [SubEl, ?ERR_BAD_REQUEST]}; sub_el = [SubEl, ?ERR_BAD_REQUEST]};
_ -> _ ->
ErrText = "Captcha test failed", ErrText = "The CAPTCHA verification has failed",
IQ#iq{type = error, IQ#iq{type = error,
sub_el = [SubEl, sub_el = [SubEl,
?ERRT_NOT_ALLOWED(Lang, ErrText)]} ?ERRT_NOT_ALLOWED(Lang, ErrText)]}
@ -215,8 +215,8 @@ process_iq(From, To,
TopInstrEl = {xmlelement, "instructions", [], TopInstrEl = {xmlelement, "instructions", [],
[{xmlcdata, [{xmlcdata,
translate:translate( translate:translate(
Lang, "You need an x:data capable client " Lang, "You need a client that supports x:data "
"with CAPTCHA support to register")}]}, "and CAPTCHA to register")}]},
InstrEl = {xmlelement, "instructions", [], InstrEl = {xmlelement, "instructions", [],
[{xmlcdata, [{xmlcdata,
translate:translate( translate:translate(
@ -241,7 +241,7 @@ process_iq(From, To,
[{"xmlns", "jabber:iq:register"}], [{"xmlns", "jabber:iq:register"}],
[TopInstrEl | CaptchaEls]}]}; [TopInstrEl | CaptchaEls]}]};
error -> error ->
ErrText = "Unable to generate a captcha", ErrText = "Unable to generate a CAPTCHA",
IQ#iq{type = error, IQ#iq{type = error,
sub_el = [SubEl, ?ERRT_INTERNAL_SERVER_ERROR( sub_el = [SubEl, ?ERRT_INTERNAL_SERVER_ERROR(
Lang, ErrText)]} Lang, ErrText)]}

6
src/web/mod_register_web.erl
View File

@ -100,7 +100,7 @@ process(["new"], #request{method = 'POST', q = Q, ip = {Ip,_Port}, lang = Lang,
{success, ok, {Username, Host, _Password}} -> {success, ok, {Username, Host, _Password}} ->
Jid = jlib:make_jid(Username, Host, ""), Jid = jlib:make_jid(Username, Host, ""),
send_registration_notifications(Jid, Ip), send_registration_notifications(Jid, Ip),
Text = ?T("Your Jabber account was succesfully created."), Text = ?T("Your Jabber account was successfully created."),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ?T("There was an error creating the account: ") ++ ErrorText = ?T("There was an error creating the account: ") ++
@ -111,7 +111,7 @@ process(["new"], #request{method = 'POST', q = Q, ip = {Ip,_Port}, lang = Lang,
process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) -> process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
case form_del_post(Q, Host) of case form_del_post(Q, Host) of
{atomic, ok} -> {atomic, ok} ->
Text = ?T("Your Jabber account was succesfully deleted."), Text = ?T("Your Jabber account was successfully deleted."),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ?T("There was an error deleting the account: ") ++ ErrorText = ?T("There was an error deleting the account: ") ++
@ -124,7 +124,7 @@ process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host})
process(["change_password"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) -> process(["change_password"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
case form_changepass_post(Q, Host) of case form_changepass_post(Q, Host) of
{atomic, ok} -> {atomic, ok} ->
Text = ?T("The password of your Jabber account was succesfully changed."), Text = ?T("The password of your Jabber account was successfully changed."),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ?T("There was an error changing the password: ") ++ ErrorText = ?T("There was an error changing the password: ") ++