diff --git a/src/as/com/threerings/util/MessageBundle.as b/src/as/com/threerings/util/MessageBundle.as index 5ef904483..1f3c9b134 100644 --- a/src/as/com/threerings/util/MessageBundle.as +++ b/src/as/com/threerings/util/MessageBundle.as @@ -189,13 +189,15 @@ public class MessageBundle return qbundle.get(getUnqualifiedKey(key), args); } - // look up our message string, selecting the proper plurality - // string if our first argument can be coaxed into an integer - var msg :String = getResourceString(key + getSuffix(args), false); + // Select the proper suffix if our first argument can be coaxed into an integer + var suffix :String = getSuffix(args); + var msg :String = getResourceString(key + suffix, false); - // if the suffixed key was not found, just try the original key if (msg == null) { - msg = getResourceString(key, false); + if (suffix != "") { + // Try the original key + msg = getResourceString(key, false); + } // if the msg is still missing, we have a problem if (msg == null) { diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/java/com/threerings/util/MessageBundle.java index ca056f490..8f8c30799 100644 --- a/src/java/com/threerings/util/MessageBundle.java +++ b/src/java/com/threerings/util/MessageBundle.java @@ -293,14 +293,15 @@ public class MessageBundle return qbundle.get(getUnqualifiedKey(key), args); } - // look up our message string, selecting the proper plurality - // string if our first argument is an Integer - String msg = getResourceString(key + getSuffix(args), false); + // Select the proper suffix if our first argument can be coaxed into an integer + String suffix = getSuffix(args); + String msg = getResourceString(key + suffix, false); - // if the base key is not found, look to see if we should try to - // convert our first argument to an Integer and try again if (msg == null) { - msg = getResourceString(key, false); + if (suffix != "") { + // Try the original key + msg = getResourceString(key, false); + } if (msg == null) { log.warning("Missing translation message", "bundle", _path, "key", key,