From e114e90a05714763b50874390628f72e8ce4a372 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Thu, 17 Jul 2008 18:17:27 +0000 Subject: [PATCH] We need to ensure our message has been translated before we try to filter it. Otherwise when a NPP says something where the key contains a word filtered in a particular language, the system doesn't find the key, and everyone gets really confused. (Was not a problem before because we normally filter using word breaks... but not all languages use such things as spaces.) git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5236 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/chat/client/ChatDirector.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index 7ba8621ca..de10a95e1 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -724,6 +724,12 @@ public class ChatDirector extends BasicDirector // if there was an originating speaker, see if we want to hear it if (speaker != null) { + + // We pre-translate this message here because we're about to filter it. + // And if we filter first, we could end up filtering keys. + msg.message = xlate(msg.bundle, msg.message); + msg.bundle = null; + if ((msg.message = filter(msg.message, speaker, false)) == null) { return; }