From 8a7234313051e59db7584b1ebf36b91ae757f46b Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 17 Jul 2008 23:00:29 +0000 Subject: [PATCH] Copy mthomas' r5236 change to the actionscript side. How was this not a problem before? Maybe we just got lucky on yohoho and never had an npp say something with filterable words in the translation key. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5237 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/crowd/chat/client/ChatDirector.as | 5 +++++ src/java/com/threerings/crowd/chat/client/ChatDirector.java | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/as/com/threerings/crowd/chat/client/ChatDirector.as index b840d4aff..f3d74fca8 100644 --- a/src/as/com/threerings/crowd/chat/client/ChatDirector.as +++ b/src/as/com/threerings/crowd/chat/client/ChatDirector.as @@ -669,6 +669,11 @@ 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; } diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index de10a95e1..45ee6d920 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -724,7 +724,6 @@ 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);