* src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence

to make more natural

SVN Revision: 1025

diff --git a/ChangeLog b/ChangeLog
index 614e132953e3d8bd6303afaa78901f5b3d58fd7b..34bad79ee4c6e019dd491532f7a5fbb0a5d3212f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-05  Badlop  <badlop@process-one.net>
 
+       * 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 67e2610df7b3d4f828351d7c78a7305308d6ce57..282b212eea56ddaec2fd09a52c340cc1d1e16956 100644 (file)
--- 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 4d1ba7339a3d697363391046d1847b63b952dd54..2c7eb575c6f75193b575e4a77dd3884ab908f234 100644 (file)
--- 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