FELIX-1501 Provide Locale in the ResourceBundle
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@903646 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/CombinedResourceBundle.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/CombinedResourceBundle.java
index 6b6c44c..eafc68e 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/CombinedResourceBundle.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/CombinedResourceBundle.java
@@ -20,6 +20,7 @@
import java.util.Enumeration;
+import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -29,12 +30,21 @@
private final ResourceBundle resourceBundle;
private final ResourceBundle defaultResourceBundle;
+ private final Locale locale;
- CombinedResourceBundle( final ResourceBundle resourceBundle, final ResourceBundle defaultResourceBundle )
+ CombinedResourceBundle( final ResourceBundle resourceBundle, final ResourceBundle defaultResourceBundle,
+ final Locale locale )
{
this.resourceBundle = resourceBundle;
this.defaultResourceBundle = defaultResourceBundle;
+ this.locale = locale;
+ }
+
+
+ public Locale getLocale()
+ {
+ return locale;
}
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleManager.java
index 825e99b..289890f 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleManager.java
@@ -79,7 +79,7 @@
}
final ResourceBundle bundleResourceBundle = cache.getResourceBundle( locale );
- return new CombinedResourceBundle( bundleResourceBundle, defaultResourceBundle );
+ return new CombinedResourceBundle( bundleResourceBundle, defaultResourceBundle, locale );
}