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
This commit is contained in:
@@ -669,6 +669,11 @@ public class ChatDirector extends BasicDirector
|
|||||||
|
|
||||||
// if there was an originating speaker, see if we want to hear it
|
// if there was an originating speaker, see if we want to hear it
|
||||||
if (speaker != null) {
|
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) {
|
if ((msg.message = filter(msg.message, speaker, false)) == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -724,7 +724,6 @@ public class ChatDirector extends BasicDirector
|
|||||||
|
|
||||||
// if there was an originating speaker, see if we want to hear it
|
// if there was an originating speaker, see if we want to hear it
|
||||||
if (speaker != null) {
|
if (speaker != null) {
|
||||||
|
|
||||||
// We pre-translate this message here because we're about to filter it.
|
// We pre-translate this message here because we're about to filter it.
|
||||||
// And if we filter first, we could end up filtering keys.
|
// And if we filter first, we could end up filtering keys.
|
||||||
msg.message = xlate(msg.bundle, msg.message);
|
msg.message = xlate(msg.bundle, msg.message);
|
||||||
|
|||||||
Reference in New Issue
Block a user