X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Faddressbook%2Fbeans%2FBaseAddressbookBean.java;h=c2448ab9207b7afaeaf0694852976db6a9bcfffb;hb=93af2fabc47cccaa8625481a948a451a24867247;hp=e84a39e10e4eedd8223b57a2947380e49195d8d4;hpb=310a826ffe866ab0ea0a2e014bf6cb23b72a616f;p=addressbook-war.git

diff --git a/src/java/org/mxchange/addressbook/beans/BaseAddressbookBean.java b/src/java/org/mxchange/addressbook/beans/BaseAddressbookBean.java
index e84a39e1..c2448ab9 100644
--- a/src/java/org/mxchange/addressbook/beans/BaseAddressbookBean.java
+++ b/src/java/org/mxchange/addressbook/beans/BaseAddressbookBean.java
@@ -17,6 +17,7 @@
 package org.mxchange.addressbook.beans;
 
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import org.mxchange.jcoreee.bean.faces.BaseFacesBean;
 
@@ -41,12 +42,27 @@ public abstract class BaseAddressbookBean extends BaseFacesBean {
 	}
 
 	@Override
-	protected ResourceBundle loadResourceBundle (final Locale locale) {
-		// Load resource bundle
-		ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale);
+	protected void loadResourceBundles (final Locale locale) {
+		// Is any locale loaded? (Will be 2)
+		if (BaseFacesBean.getBundles().isEmpty()) {
+			// Load resource bundles, so it will be loaded from this JAR"
+			// 1) Generic
+			ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.generic", locale);
+			BaseFacesBean.getBundles().add(bundle);
 
-		// Return it
-		return bundle;
+			// 2) Project-specific
+			bundle = ResourceBundle.getBundle("org.mxchange.localization.project", locale);
+			BaseFacesBean.getBundles().add(bundle);
+
+			// Try the local file
+			try {
+				// 3) Local (not committed)
+				bundle = ResourceBundle.getBundle("org.mxchange.localization.local", locale);
+				BaseFacesBean.getBundles().add(bundle);
+			} catch (final MissingResourceException ex) {
+				// Cannot load it, it is okay here
+			}
+		}
 	}
 
 }