From 8e820811bcb3c77033a65c4a95aa9fdb6f2510b9 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 20 May 2003 20:58:31 +0000 Subject: [PATCH] No reason that embedded translation strings can't also be qualified (it's quite necessary in fact). git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2594 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/util/MessageBundle.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/java/com/threerings/util/MessageBundle.java index 2c47e0f31..5ea68ab95 100644 --- a/src/java/com/threerings/util/MessageBundle.java +++ b/src/java/com/threerings/util/MessageBundle.java @@ -1,5 +1,5 @@ // -// $Id: MessageBundle.java,v 1.19 2003/03/05 23:27:39 mdb Exp $ +// $Id: MessageBundle.java,v 1.20 2003/05/20 20:58:31 mdb Exp $ package com.threerings.util; @@ -399,11 +399,10 @@ public class MessageBundle { // sanity check if (bundle.indexOf(QUAL_PREFIX) != -1 || - bundle.indexOf(QUAL_SEP) != -1 || - key.indexOf(QUAL_PREFIX) != -1) { + bundle.indexOf(QUAL_SEP) != -1) { String errmsg = "Message bundle may not contain '" + QUAL_PREFIX + - "' or '" + QUAL_SEP + "' and message key may not contain '" + - QUAL_PREFIX + "' [bundle=" + bundle + ", key=" + key + "]"; + "' or '" + QUAL_SEP + "' [bundle=" + bundle + + ", key=" + key + "]"; throw new IllegalArgumentException(errmsg); } return QUAL_PREFIX + bundle + QUAL_SEP + key;