Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

Fix English strings (thanks to Andreas van Cranenburgh)

Browse Source
This commit is contained in:
Badlop 2012-04-24 10:13:20 +02:00
parent 752652e56c
commit 7dd171322d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_captcha.erl
View File

@ -304,7 +304,7 @@ process(_Handlers, #request{method='POST', q=Q, lang=Lang, path=[_, Id]}) ->
Form = Form =
{xmlelement, "p", [], {xmlelement, "p", [],
[{xmlcdata, [{xmlcdata,
translate:translate(Lang, "The captcha is valid.") translate:translate(Lang, "The CAPTCHA is valid.")
}]}, }]},
ejabberd_web:make_xhtml([Form]); ejabberd_web:make_xhtml([Form]);
captcha_non_valid -> captcha_non_valid ->

6
src/mod_muc/mod_muc_room.erl
View File

@ -363,7 +363,7 @@ normal_state({route, From, "",
error -> error ->
ErrText = "Failed to extract " ErrText = "Failed to extract "
"JID from your voice " "JID from your voice "
"request approvement", "request approval",
Err = jlib:make_error_reply( Err = jlib:make_error_reply(
Packet, Packet,
?ERRT_BAD_REQUEST( ?ERRT_BAD_REQUEST(
@ -1861,7 +1861,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
From, Err), From, Err),
StateData; StateData;
_ -> _ ->
ErrText = "Unable to generate a captcha", ErrText = "Unable to generate a CAPTCHA",
Err = jlib:make_error_reply( Err = jlib:make_error_reply(
Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)), Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
ejabberd_router:route( % TODO: s/Nick/""/ ejabberd_router:route( % TODO: s/Nick/""/
@ -3314,7 +3314,7 @@ get_config(Lang, StateData, From) ->
] ++ ] ++
case ejabberd_captcha:is_feature_available() of case ejabberd_captcha:is_feature_available() of
true -> true ->
[?BOOLXFIELD("Make room captcha protected", [?BOOLXFIELD("Make room CAPTCHA protected",
"captcha_protected", "captcha_protected",
Config#config.captcha_protected)]; Config#config.captcha_protected)];
false -> [] false -> []