* src/mod_muc/mod_muc_room.erl: Allow unmoderated rooms (EJAB-437)

* src/msgs/*: Recover old translations to several languages from
ejabberd 1.1.4

SVN Revision: 1191

diff --git a/ChangeLog b/ChangeLog
index 48d709607c4188ef4989df6438db22a8153e4146..a1153cc70315e4167a6b6d989c77420e5945834f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-14  Badlop  <badlop@process-one.net>
+
+       * src/mod_muc/mod_muc_room.erl: Allow unmoderated rooms (EJAB-437)
+       * src/msgs/*: Recover old translations to several languages from
+       ejabberd 1.1.4
+
 2008-02-14  Alexey Shchepin  <alexey@process-one.net>
 
        * src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 6e61180c09008aeb5e0de30b72547e5dca549139..8c848efa5d335ece37558364ca5966ccee6ceec9 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -65,7 +65,7 @@
                 public = true,
                 public_list = true,
                 persistent = false,
-                moderated = true, % TODO
+                moderated = true,
                 members_by_default = true,
                 members_only = false,
                 allow_user_invites = false,
@@ -781,7 +781,8 @@ process_groupchat_message(From, {xmlelement, "message", Attrs, _Els} = Packet,
                ?DICT:find(jlib:jid_tolower(From),
                           StateData#state.users),
            if
-               (Role == moderator) or (Role == participant) ->
+               (Role == moderator) or (Role == participant) 
+               or ((StateData#state.config)#config.moderated == false) ->
                    {NewStateData1, IsAllowed} =
                        case check_subject(Packet) of
                            false ->
@@ -2639,9 +2640,9 @@ get_config(Lang, StateData, From) ->
         ?BOOLXFIELD("Make room members-only",
                     "muc#roomconfig_membersonly",
                     Config#config.members_only),
-        %%?BOOLXFIELD("Make room moderated",
-        %%          "muc#roomconfig_moderatedroom",
-        %%          Config#config.moderated),
+        ?BOOLXFIELD("Make room moderated",
+                    "muc#roomconfig_moderatedroom",
+                    Config#config.moderated),
         ?BOOLXFIELD("Default users as participants",
                     "members_by_default",
                     Config#config.members_by_default),

diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
index 93b3a1d4d8a4f1d8e7873e9708afbca5da48d234..78fdce88b371637c4af0ff3dc5c0a04be713116a 100644 (file)
--- a/src/msgs/cs.msg
+++ b/src/msgs/cs.msg
@@ -106,6 +106,7 @@
 {"Specified nickname is already registered", "Zadaná přezdívka je již zaregistrována"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Nastavit místnost jako moderovanou"}.
 {" has set the subject to: ", " změnil(a) téma na: "}.
 {"You need an x:data capable client to configure room", "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}.
 {"Configuration for ", "Konfigurace pro "}.

diff --git a/src/msgs/de.msg b/src/msgs/de.msg
index e6f10163af73440f5d9e334f9d8a2521e2824070..f927520ef14540f3f50a3563448e69528438bab5 100644 (file)
--- a/src/msgs/de.msg
+++ b/src/msgs/de.msg
@@ -326,6 +326,7 @@
 {"ejabberd MUC module", "ejabberd MUC Modul"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Raum modieriert machen"}.
 {"Traffic rate limit is exceeded", "Datenrate ist zu hoch"}.
 {"It is not allowed to send private messages to the conference", "Es ist nicht erlaubt private Nachrichten an den Raum zu schicken"}.
 {"Improper message type", "Unzulässiger Nachrichtentyp"}.

diff --git a/src/msgs/es.msg b/src/msgs/es.msg
index d9149f30a7285b2bbc26bb4f18e5f5e8f6ff2191..570c12dd41a5d2e0d6fe9f759c43eedeae851dc7 100644 (file)
--- a/src/msgs/es.msg
+++ b/src/msgs/es.msg
@@ -142,6 +142,7 @@
 {"Chatrooms", "Salas de charla"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Sala moderada"}.
 {" has set the subject to: ", " ha puesto el asunto: "}.
 {"You need an x:data capable client to configure room", "Necesitas un cliente con soporte de x:data para configurar la sala"}.
 {"Configuration for ", "Configuración para "}.

diff --git a/src/msgs/fr.msg b/src/msgs/fr.msg
index 3df0e1d2adb95a7d3827460d902b287d6ec9d009..a59d57281fdd7f184ca45f38c5de5ce8b039855c 100644 (file)
--- a/src/msgs/fr.msg
+++ b/src/msgs/fr.msg
@@ -205,6 +205,7 @@
 {"Chatrooms", "Salons de discussion"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Rendre le salon modéré"}.
 {" has set the subject to: ", " a changé le sujet pour: "}.
 {"You need an x:data capable client to configure room", "Vous avez besoin d'un client supportant x:data pour configurer le salon"}.
 {"Configuration for ", "Configuration pour "}.

diff --git a/src/msgs/nl.msg b/src/msgs/nl.msg
index 846c9be280e1254c19db824e8399d35c888cd6e7..6b57533ea2b5c254de44c6122aabf7a0e94f8593 100644 (file)
--- a/src/msgs/nl.msg
+++ b/src/msgs/nl.msg
@@ -153,6 +153,7 @@
 {"Chatrooms", "Groepsgesprekken"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Chatruimte gemodereerd maken"}.
 {"Only moderators and participants are allowed to change subject in this room", "Alleen moderators en deelnemers mogen het onderwerp van deze chatruimte veranderen"}.
 {"Only moderators are allowed to change subject in this room", "Alleen moderators mogen het onderwerp van deze chatruimte veranderen"}.
 {"Visitors are not allowed to send messages to all occupants", "Bezoekers mogen geen berichten verzenden naar alle aanwezigen"}.

diff --git a/src/msgs/pl.msg b/src/msgs/pl.msg
index 1d05b5916951f96999e42309296d294eda91cbfe..af7205c6c1ba5cfbd1fffa2ac94f750370000bdc 100644 (file)
--- a/src/msgs/pl.msg
+++ b/src/msgs/pl.msg
@@ -115,6 +115,7 @@
 {"Specified nickname is already registered", "Podany nick jest już zarejestrowany"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Moderuj pokój"}.
 {"Traffic rate limit is exceeded", "Limit transferu przekroczony"}.
 {"Maximum Number of Occupants", "Maksymalna liczba uczestników"}.
 {"No limit", "Bez limitu"}.

diff --git a/src/msgs/pt-br.msg b/src/msgs/pt-br.msg
index f90590432b9796d4ba68f040038d919916f09247..fabca538c21860350b9164dc34676366543d7849 100644 (file)
--- a/src/msgs/pt-br.msg
+++ b/src/msgs/pt-br.msg
@@ -116,6 +116,7 @@
 {"You need an x:data capable client to register nickname", "Necessitas um cliente com suporte de x:data para poder registrar o nick"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Tornar a sala moderada"}.
 {"Administrator privileges required", "Se necessita privilégios de administrador"}.
 {"Configuration for ", "Configuração para "}.
 {" has set the subject to: ", " a posto o assunto: "}.

diff --git a/src/msgs/pt.msg b/src/msgs/pt.msg
index bf7060603700bf6969b987f844170fa07ce34f09..93fa0406311f8511e68d84dfe13649ffd35fd543 100644 (file)
--- a/src/msgs/pt.msg
+++ b/src/msgs/pt.msg
@@ -105,6 +105,7 @@
 {"Specified nickname is already registered", "A alcunha especificada já está registada"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Tornar a sala moderada"}.
 {" has set the subject to: ", " colocou o tópico: "}.
 {"You need an x:data capable client to configure room", "É necessário um cliente com suporte de x:data para configurar a sala"}.
 {"Configuration for ", "Configuração para "}.

diff --git a/src/msgs/ru.msg b/src/msgs/ru.msg
index a6544d9ebc0f80f2afce876c38d0c423af898bcd..ea3164680ab8c833d388a843aafc487af110c810 100644 (file)
--- a/src/msgs/ru.msg
+++ b/src/msgs/ru.msg
@@ -206,6 +206,7 @@
 {"Room Configuration", "Конфигурация комнаты"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Сделать комнату модерируемой"}.
 {"This room is not anonymous", "Эта комната не анонимная"}.
 {" has set the subject to: ", " установил(а) тему: "}.
 {"You need an x:data capable client to configure room", "Чтобы сконфигурировать комнату, требуется x:data-совместимый клиент"}.

diff --git a/src/msgs/sk.msg b/src/msgs/sk.msg
index f0842a6e3f48c0c200b048bd9c0d6a735609a2d5..ba24a0ac928818e08e934a29314ce32c68b1dd7f 100644 (file)
--- a/src/msgs/sk.msg
+++ b/src/msgs/sk.msg
@@ -106,6 +106,7 @@
 {"ejabberd MUC module", "Ejabberd MUC modul"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Nastaviť miestnosť ako moderovanú"}.
 {"This room is not anonymous", "Táto miestnosť nie je anonymná"}.
 {"Make room persistent", "Nastaviť miestnosť ako trvalú"}.
 {"Make room public searchable", "Nastaviť miestnosť ako verejne prehľadávateľnú"}.

diff --git a/src/msgs/sv.msg b/src/msgs/sv.msg
index fca11bb866fca932f24b4792c74adc415e7a136f..498595cfc469dbd659c987f5e9ddfbb12f6cc10e 100644 (file)
--- a/src/msgs/sv.msg
+++ b/src/msgs/sv.msg
@@ -132,6 +132,7 @@
 {"Specified nickname is already registered", "Detta smeknamnet är redan registrerat"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Gör rummet modererat"}.
 {" has set the subject to: ", " har satt ämnet till: "}.
 {"You need an x:data capable client to configure room", "Du behöver en klient som stödjer x:data för att konfiguera detta rum"}.
 {"Configuration for ", "Konfiguration för "}.

diff --git a/src/msgs/uk.msg b/src/msgs/uk.msg
index 50b05f8f731a576dd51f612c5f5a93ef69e272b4..0095696853d263b0c5d1a2d806ae65d41d529a97 100644 (file)
--- a/src/msgs/uk.msg
+++ b/src/msgs/uk.msg
@@ -206,6 +206,7 @@
 {"Room Configuration", "Конфігурація кімнати"}.
 
 % mod_muc/mod_muc_room.erl
+{"Make room moderated", "Зробити кімнату модерованою"}.
 {"Traffic rate limit is exceeded", "Швидкість передачі інформації було перевищено"}.
 {"Maximum Number of Occupants", "Максимальна кількість учасників"}.
 {"No limit", "Без обмежень"}.
@@ -383,4 +384,3 @@
 % mode: erlang
 % End:
 % vim: set filetype=erlang tabstop=8:
-