| commit | 56d695bb2c9216ffee4800d364d79d4139d5a1d4 | [log] [tgz] |
|---|---|---|
| author | Valentin Valchev <vvalchev@apache.org> | Tue Sep 21 15:06:12 2010 +0000 |
| committer | Valentin Valchev <vvalchev@apache.org> | Tue Sep 21 15:06:12 2010 +0000 |
| tree | 7d5e9fb33b7e727f6feee7ee9aee5fd65b71851a | |
| parent | 499d10940a83aac3680b3ecae831e8835192afff [diff] |
Fixed FELIX-2609 /WebConsole doesn't work with JDK 1.3.1_06 because of Locale/ https://issues.apache.org/jira/browse/FELIX-2609 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@999455 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java index 054fb02..d30a83f 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java
@@ -169,7 +169,7 @@ } else if ( locale.getCountry().length() != 0 ) { - return new Locale( locale.getLanguage() ); + return new Locale( locale.getLanguage(), "" ); //$NON-NLS-1$ } else if ( !locale.getLanguage().equals( DEFAULT_LOCALE.getLanguage() ) ) {
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java index a41fa6f..cfd0eca 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -965,7 +965,7 @@ final String name = FilenameUtils.getBaseName(img.getFile()); try { - final String locale = new Locale(name).getDisplayLanguage(); + final String locale = new Locale(name, "").getDisplayLanguage(); //$NON-NLS-1$ map.put(name, null != locale ? locale : name); } catch (Throwable t)