From f4c88768dada7d41e6f0b02ce71e1f66ff83440d Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 8 Apr 2009 19:04:13 +0000 Subject: [PATCH] * 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 SVN Revision: 2009 --- ChangeLog | 6 ++++++ src/mod_muc/mod_muc.erl | 2 +- src/mod_muc/mod_muc_log.erl | 2 +- src/mod_muc/mod_muc_room.erl | 18 +++++++++--------- src/mod_register.erl | 2 +- src/web/ejabberd_web_admin.erl | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9df7f44ed..be503b1d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-08 Badlop + * 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 add TODO comments. diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl index 831481684..6edbbdf82 100644 --- a/src/mod_muc/mod_muc.erl +++ b/src/mod_muc/mod_muc.erl @@ -706,7 +706,7 @@ iq_set_register_info(Host, From, Nick, Lang) -> {atomic, ok} -> {result, []}; {atomic, false} -> - ErrText = "Specified nickname is already registered", + ErrText = "That nickname is registered by another person", {error, ?ERRT_CONFLICT(Lang, ErrText)}; _ -> {error, ?ERR_INTERNAL_SERVER_ERROR} diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl index 6ef07bc23..2dba277e8 100644 --- a/src/mod_muc/mod_muc_log.erl +++ b/src/mod_muc/mod_muc_log.erl @@ -837,7 +837,7 @@ get_roomconfig_text(anonymous) -> "Make room semianonymous"; get_roomconfig_text(members_only) -> "Make room members-only"; get_roomconfig_text(moderated) -> "Make room moderated"; 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_query_users) -> "Allow users to query other users"; get_roomconfig_text(allow_user_invites) -> "Allow users to send invites"; diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 7a1618147..2fc518c80 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -797,12 +797,12 @@ process_groupchat_message(From, {xmlelement, "message", Attrs, _Els} = Packet, ?ERRT_FORBIDDEN( Lang, "Only moderators and participants " - "are allowed to change subject in this room"); + "are allowed to change the subject in this room"); _ -> ?ERRT_FORBIDDEN( Lang, "Only moderators " - "are allowed to change subject in this room") + "are allowed to change the subject in this room") end, ejabberd_router:route( StateData#state.jid, @@ -910,7 +910,7 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet, StateData; {true, _, _} -> 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( Packet, ?ERRT_CONFLICT(Lang, ErrText)), @@ -921,7 +921,7 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet, From, Err), StateData; {_, 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)), @@ -1492,7 +1492,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> ErrText = "You have been banned from this room", ?ERRT_FORBIDDEN(Lang, ErrText); _ -> - ErrText = "Membership required to enter this room", + ErrText = "Membership is required to enter this room", ?ERRT_REGISTRATION_REQUIRED(Lang, ErrText) end), ejabberd_router:route( % TODO: s/Nick/""/ @@ -1500,7 +1500,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> From, Err), StateData; {_, 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)), ejabberd_router:route( % TODO: s/Nick/""/ @@ -1508,7 +1508,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> From, Err), StateData; {_, _, 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)), ejabberd_router:route( % TODO: s/Nick/""/ @@ -1554,7 +1554,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> NewState#state{robots = Robots} end; nopass -> - ErrText = "Password required to enter this room", + ErrText = "A password is required to enter this room", Err = jlib:make_error_reply( Packet, ?ERRT_NOT_AUTHORIZED(Lang, ErrText)), ejabberd_router:route( % TODO: s/Nick/""/ @@ -2818,7 +2818,7 @@ get_config(Lang, StateData, From) -> ?BOOLXFIELD("Default users as participants", "members_by_default", Config#config.members_by_default), - ?BOOLXFIELD("Allow users to change subject", + ?BOOLXFIELD("Allow users to change the subject", "muc#roomconfig_changesubject", Config#config.allow_change_subj), ?BOOLXFIELD("Allow users to send private messages", diff --git a/src/mod_register.erl b/src/mod_register.erl index 4530f10bc..d8bcbbebd 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -241,7 +241,7 @@ try_register(User, Server, Password, Source, Lang) -> end; false -> ErrText = "Users are not allowed to register " - "accounts so fast", + "accounts so quickly", {error, ?ERRT_RESOURCE_CONSTRAINT(Lang, ErrText)} end end diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 66cb106d2..0b74a7ee0 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1778,7 +1778,7 @@ get_node(global, Node, ["backup"], Query, Lang) -> end, [?XC("h1", ?T("Backup of ") ++ atom_to_list(Node))] ++ 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("table", [], [?XE("tbody",