Author: sebb
Date: Thu Apr 30 11:48:48 2009
New Revision: 770174
URL: http://svn.apache.org/viewvc?rev=770174&view=rev
Log:
Bug 47127 - Unable to change language to pl_PL
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=770174&r1=770173&r2=770174&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Thu
Apr 30 11:48:48 2009
@@ -324,7 +324,12 @@
ResourceBundle resBund =
ResourceBundle.getBundle("org.apache.jmeter.resources.messages", loc); //
$NON-NLS-1$
if (isDefault || resBund.getLocale().equals(loc)) {// language
change worked
resources = resBund;
- locale = loc;
+ locale = loc;
+ // Check if we at least found the correct language:
+ } else if
(resBund.getLocale().getLanguage().equals(loc.getLanguage())) {
+ log.warn("Unable to change language to '"+loc.toString()+"',
using '"+loc.getLanguage()+"'");
+ resources = resBund;
+ locale = loc;
} else {
log.error("Unable to change language to "+loc.toString());
throw new JMeterError("Unable to change language to
"+loc.toString());
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=770174&r1=770173&r2=770174&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Apr 30 11:48:48 2009
@@ -206,6 +206,7 @@
<li>Avoid NPE if XPath function does not match any nodes</li>
<li>Fix processing of Transaction Sampler parent mode so current sampler is
set to actual sampler</li>
<li>Fix processing of first file name in HTTP POST so functions/variables work
(bug introduced with multiple file support)</li>
+<li>Bug 47127 - Unable to change language to pl_PL</li>
</ul>
<h3>Improvements</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
