diff options
| author | Badlop <badlop@process-one.net> | 2009-05-26 11:03:45 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-05-26 11:03:45 +0000 |
| commit | 5c00365550d352046b8b3ee54db2cf22a0c8c0d0 (patch) | |
| tree | e78fc2c7252942a540be3f8cb763ef5d4b0e0841 /src/ejabberd_captcha.erl | |
| parent | Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei G... (diff) | |
Add label in captcha form. Improve translatable strings in captcha and muc room.
SVN Revision: 2100
Diffstat (limited to 'src/ejabberd_captcha.erl')
| -rw-r--r-- | src/ejabberd_captcha.erl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl index a51aef4c..c509dace 100644 --- a/src/ejabberd_captcha.erl +++ b/src/ejabberd_captcha.erl @@ -27,11 +27,6 @@ {xmlelement, "field", [{"type", Type}, {"var", Var}], [{xmlelement, "value", [], [Value]}]}). --define(CAPTCHA_BODY(Lang, Room, URL), - translate:translate(Lang, "Your messages to ") ++ Room - ++ translate:translate(Lang, " are being blocked. To unblock them, visit ") - ++ URL). - -define(CAPTCHA_TEXT(Lang), translate:translate(Lang, "Enter the text you see")). -define(CAPTCHA_LIFETIME, 120000). % two minutes @@ -76,12 +71,14 @@ create_captcha(Id, SID, From, To, Lang, Args) ?VFIELD("hidden", "from", {xmlcdata, jlib:jid_to_string(To)}), ?VFIELD("hidden", "challenge", {xmlcdata, Id}), ?VFIELD("hidden", "sid", {xmlcdata, SID}), - {xmlelement, "field", [{"var", "ocr"}], + {xmlelement, "field", [{"var", "ocr"}, {"label", ?CAPTCHA_TEXT(Lang)}], [{xmlelement, "media", [{"xmlns", ?NS_MEDIA}], [{xmlelement, "uri", [{"type", Type}], [{xmlcdata, "cid:" ++ CID}]}]}]}]}]}, + BodyString1 = translate:translate(Lang, "Your messages to ~s are being blocked. To unblock them, visit ~s"), + BodyString = io_lib:format(BodyString1, [JID, get_url(Id)]), Body = {xmlelement, "body", [], - [{xmlcdata, ?CAPTCHA_BODY(Lang, JID, get_url(Id))}]}, + [{xmlcdata, BodyString}]}, OOB = {xmlelement, "x", [{"xmlns", ?NS_OOB}], [{xmlelement, "url", [], [{xmlcdata, get_url(Id)}]}]}, Tref = erlang:send_after(?CAPTCHA_LIFETIME, ?MODULE, {remove_id, Id}), |