sebb 2005/06/18 16:19:47
Modified: src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Bug 29920 - change default locale if necessary to ensure default properties
are picked up when English is chosen.
Revision Changes Path
1.73 +17 -4
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- JMeterUtils.java 14 Jun 2005 23:45:11 -0000 1.72
+++ JMeterUtils.java 18 Jun 2005 23:19:47 -0000 1.73
@@ -242,7 +242,20 @@
*/
public static void setLocale(Locale loc)
{
+ log.info("Setting Locale to "+loc.toString());
locale = loc;
+ /*
+ * See bug 29920.
+ * getBundle() defaults to the property file for the default Locale
+ * before it defaults to the base property file, so we need to change
+ * the default Locale to ensure the base property file is found.
+ */
+ if(loc.getLanguage() == Locale.ENGLISH.getLanguage()
+ && // Don't change locale from en_GB to en
+ Locale.getDefault().getLanguage() != Locale.ENGLISH.getLanguage()
+ ) {
+ Locale.setDefault(Locale.ENGLISH);
+ }
resources =
ResourceBundle.getBundle(
"org.apache.jmeter.resources.messages",
@@ -338,8 +351,8 @@
{
return null;
}
- key = key.replace(' ', '_');
- key = key.toLowerCase();
+ key = key.replace(' ', '_'); //TODO - why does it do this?
+ key = key.toLowerCase(); //(it's been here since v1.1)
String resString = null;
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
