From 536a120c9dc672ee48b47da2a63249963e6e776a Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 5 Dec 2007 09:09:09 +0000 Subject: * src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence to make more natural SVN Revision: 1025 --- ChangeLog | 3 +++ src/mod_muc/mod_muc_room.erl | 9 +++++---- src/msgs/es.msg | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 614e13295..34bad79ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-12-05 Badlop + * src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence + to make more natural + * src/msgs/es.msg: Updated * src/ejabberd.hrl: Set more proper version number diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 67e2610df..282b212ee 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -2968,11 +2968,12 @@ check_invitation(From, Els, Lang, StateData) -> io_lib:format( translate:translate( Lang, - "You have been invited to ~s by ~s"), - [jlib:jid_to_string({StateData#state.room, + "~s invites you to the room ~s"), + [jlib:jid_to_string(From), + jlib:jid_to_string({StateData#state.room, StateData#state.host, - ""}), - jlib:jid_to_string(From)])) ++ + ""}) + ])) ++ case (StateData#state.config)#config.password_protected of true -> ", " ++ diff --git a/src/msgs/es.msg b/src/msgs/es.msg index 4d1ba7339..2c7eb575c 100644 --- a/src/msgs/es.msg +++ b/src/msgs/es.msg @@ -192,7 +192,7 @@ {"Traffic rate limit is exceeded", "Se ha exedido el límite de tráfico"}. {"Maximum Number of Occupants", "Número máximo de ocupantes"}. {"No limit", "Sin límite"}. -{"You have been invited to ~s by ~s", "Has sido invitado a la sala de charla ~s. La invitación te la envió ~s"}. +{"~s invites you to the room ~s", "~s te invita a la sala ~s"}. {"the password is", "la contraseña es"}. % mod_muc/mod_muc_log.erl -- cgit v1.2.3