AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new isTainted and untaint methods.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5680 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-03-05 01:22:49 +00:00
parent aa0bb22527
commit 5bd1ef9d8c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/util/MessageBundle.java
+4 -4
View File
@@ -172,8 +172,8 @@ public class MessageBundle
{ {
// if this string is tainted, we don't translate it, instead we // if this string is tainted, we don't translate it, instead we
// simply remove the taint character and return it to the caller // simply remove the taint character and return it to the caller
if (key.startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(key)) {
return key.substring(1); return MessageUtil.untaint(key);
} }
String msg = getResourceString(key); String msg = getResourceString(key);
@@ -409,8 +409,8 @@ public class MessageBundle
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
// if the argument is tainted, do no further translation // if the argument is tainted, do no further translation
// (it might contain |s or other fun stuff) // (it might contain |s or other fun stuff)
if (args[i].startsWith(MessageUtil.TAINT_CHAR)) { if (MessageUtil.isTainted(args[i])) {
args[i] = MessageUtil.unescape(args[i].substring(1)); args[i] = MessageUtil.unescape(MessageUtil.untaint(args[i]));
} else { } else {
args[i] = xlate(MessageUtil.unescape(args[i])); args[i] = xlate(MessageUtil.unescape(args[i]));
} }