Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)

Browse Source 
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 2009
This commit is contained in:
Badlop 2009-04-08 19:04:13 +00:00
parent 4dd21545a0
commit f4c88768da
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2009-04-08 Badlop <badlop@process-one.net> 2009-04-08 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberd_frontend_socket.erl: Fix compilation warnings and * src/ejabberd_frontend_socket.erl: Fix compilation warnings and
add TODO comments. add TODO comments.

2
src/mod_muc/mod_muc.erl
View File

@ -706,7 +706,7 @@ iq_set_register_info(Host, From, Nick, Lang) ->
{atomic, ok} -> {atomic, ok} ->
{result, []}; {result, []};
{atomic, false} -> {atomic, false} ->
ErrText = "Specified nickname is already registered", ErrText = "That nickname is registered by another person",
{error, ?ERRT_CONFLICT(Lang, ErrText)}; {error, ?ERRT_CONFLICT(Lang, ErrText)};
_ -> _ ->
{error, ?ERR_INTERNAL_SERVER_ERROR} {error, ?ERR_INTERNAL_SERVER_ERROR}

2
src/mod_muc/mod_muc_log.erl
View File

@ -837,7 +837,7 @@ get_roomconfig_text(anonymous) -> "Make room semianonymous";
get_roomconfig_text(members_only) -> "Make room members-only"; get_roomconfig_text(members_only) -> "Make room members-only";
get_roomconfig_text(moderated) -> "Make room moderated"; get_roomconfig_text(moderated) -> "Make room moderated";
get_roomconfig_text(members_by_default) -> "Default users as participants"; get_roomconfig_text(members_by_default) -> "Default users as participants";
get_roomconfig_text(allow_change_subj) -> "Allow users to change subject"; get_roomconfig_text(allow_change_subj) -> "Allow users to change the subject";
get_roomconfig_text(allow_private_messages) -> "Allow users to send private messages"; get_roomconfig_text(allow_private_messages) -> "Allow users to send private messages";
get_roomconfig_text(allow_query_users) -> "Allow users to query other users"; get_roomconfig_text(allow_query_users) -> "Allow users to query other users";
get_roomconfig_text(allow_user_invites) -> "Allow users to send invites"; get_roomconfig_text(allow_user_invites) -> "Allow users to send invites";

18
src/mod_muc/mod_muc_room.erl
View File

@ -797,12 +797,12 @@ process_groupchat_message(From, {xmlelement, "message", Attrs, _Els} = Packet,
?ERRT_FORBIDDEN( ?ERRT_FORBIDDEN(
Lang, Lang,
"Only moderators and participants " "Only moderators and participants "
"are allowed to change subject in this room"); "are allowed to change the subject in this room");
_ -> _ ->
?ERRT_FORBIDDEN( ?ERRT_FORBIDDEN(
Lang, Lang,
"Only moderators " "Only moderators "
"are allowed to change subject in this room") "are allowed to change the subject in this room")
end, end,
ejabberd_router:route( ejabberd_router:route(
StateData#state.jid, StateData#state.jid,
@ -910,7 +910,7 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet,
StateData; StateData;
{true, _, _} -> {true, _, _} ->
Lang = xml:get_attr_s("xml:lang", Attrs), Lang = xml:get_attr_s("xml:lang", Attrs),
ErrText = "Nickname is already in use by another occupant", ErrText = "That nickname is already in use by another occupant",
Err = jlib:make_error_reply( Err = jlib:make_error_reply(
Packet, Packet,
?ERRT_CONFLICT(Lang, ErrText)), ?ERRT_CONFLICT(Lang, ErrText)),
@ -921,7 +921,7 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet,
From, Err), From, Err),
StateData; StateData;
{_, false, _} -> {_, false, _} ->
ErrText = "Nickname is registered by another person", ErrText = "That nickname is registered by another person",
Err = jlib:make_error_reply( Err = jlib:make_error_reply(
Packet, Packet,
?ERRT_CONFLICT(Lang, ErrText)), ?ERRT_CONFLICT(Lang, ErrText)),
@ -1492,7 +1492,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
ErrText = "You have been banned from this room", ErrText = "You have been banned from this room",
?ERRT_FORBIDDEN(Lang, ErrText); ?ERRT_FORBIDDEN(Lang, ErrText);
_ -> _ ->
ErrText = "Membership required to enter this room", ErrText = "Membership is required to enter this room",
?ERRT_REGISTRATION_REQUIRED(Lang, ErrText) ?ERRT_REGISTRATION_REQUIRED(Lang, ErrText)
end), end),
ejabberd_router:route( % TODO: s/Nick/""/ ejabberd_router:route( % TODO: s/Nick/""/
@ -1500,7 +1500,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
From, Err), From, Err),
StateData; StateData;
{_, true, _, _} -> {_, true, _, _} ->
ErrText = "Nickname is already in use by another occupant", ErrText = "That nickname is already in use by another occupant",
Err = jlib:make_error_reply(Packet, ?ERRT_CONFLICT(Lang, ErrText)), Err = jlib:make_error_reply(Packet, ?ERRT_CONFLICT(Lang, ErrText)),
ejabberd_router:route( ejabberd_router:route(
% TODO: s/Nick/""/ % TODO: s/Nick/""/
@ -1508,7 +1508,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
From, Err), From, Err),
StateData; StateData;
{_, _, false, _} -> {_, _, false, _} ->
ErrText = "Nickname is registered by another person", ErrText = "That nickname is registered by another person",
Err = jlib:make_error_reply(Packet, ?ERRT_CONFLICT(Lang, ErrText)), Err = jlib:make_error_reply(Packet, ?ERRT_CONFLICT(Lang, ErrText)),
ejabberd_router:route( ejabberd_router:route(
% TODO: s/Nick/""/ % TODO: s/Nick/""/
@ -1554,7 +1554,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
NewState#state{robots = Robots} NewState#state{robots = Robots}
end; end;
nopass -> nopass ->
ErrText = "Password required to enter this room", ErrText = "A password is required to enter this room",
Err = jlib:make_error_reply( Err = jlib:make_error_reply(
Packet, ?ERRT_NOT_AUTHORIZED(Lang, ErrText)), Packet, ?ERRT_NOT_AUTHORIZED(Lang, ErrText)),
ejabberd_router:route( % TODO: s/Nick/""/ ejabberd_router:route( % TODO: s/Nick/""/
@ -2818,7 +2818,7 @@ get_config(Lang, StateData, From) ->
?BOOLXFIELD("Default users as participants", ?BOOLXFIELD("Default users as participants",
"members_by_default", "members_by_default",
Config#config.members_by_default), Config#config.members_by_default),
?BOOLXFIELD("Allow users to change subject", ?BOOLXFIELD("Allow users to change the subject",
"muc#roomconfig_changesubject", "muc#roomconfig_changesubject",
Config#config.allow_change_subj), Config#config.allow_change_subj),
?BOOLXFIELD("Allow users to send private messages", ?BOOLXFIELD("Allow users to send private messages",

2
src/mod_register.erl
View File

@ -241,7 +241,7 @@ try_register(User, Server, Password, Source, Lang) ->
end; end;
false -> false ->
ErrText = "Users are not allowed to register " ErrText = "Users are not allowed to register "
"accounts so fast", "accounts so quickly",
{error, ?ERRT_RESOURCE_CONSTRAINT(Lang, ErrText)} {error, ?ERRT_RESOURCE_CONSTRAINT(Lang, ErrText)}
end end
end end

2
src/web/ejabberd_web_admin.erl
View File

@ -1778,7 +1778,7 @@ get_node(global, Node, ["backup"], Query, Lang) ->
end, end,
[?XC("h1", ?T("Backup of ") ++ atom_to_list(Node))] ++ [?XC("h1", ?T("Backup of ") ++ atom_to_list(Node))] ++
ResS ++ ResS ++
[?XCT("p", "Remark that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately."), [?XCT("p", "Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately."),
?XAE("form", [{"action", ""}, {"method", "post"}], ?XAE("form", [{"action", ""}, {"method", "post"}],
[?XAE("table", [], [?XAE("table", [],
[?XE("tbody", [?XE("tbody",