default locale: en, help pages fixed

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@748 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 12 insertions, 18 deletions

diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index d806c5fa..578df527 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -2290,26 +2290,20 @@ public class BKUGUIImpl implements BKUGUIFacade {
 	 * @param locale
 	 */
 	protected void loadMessageBundle(Locale locale) {
-		if (locale != null) {
-			// see [#378] Ignoring post parameter 'locale': bundle resolve-order
+    if (locale != null) {
+      // see [#378] Ignoring post parameter 'locale': bundle resolve-order
 			// not correct?!
-			Locale lang = new Locale(locale.getLanguage().substring(0, 2));
-			log.debug("Loading message bundle for language: {}.", lang.toString());
-			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
-		} else {
-			log.debug("Loading default language message bundle.");
-			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
-		}
+			log.debug("Loading message bundle for language: {}.", locale);
+			messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+    } else {
+      messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+    }
 
-		if (log.isDebugEnabled()) {
-			if (messages.getLocale() == null
-					|| "".equals(messages.getLocale().getLanguage())) {
-				log.info("Fallback to default locale message bundle.");
-			} else {
-				log.info("Applet message bundle loaded for {}.",
-						messages.getLocale());
-			}
-		}
+    if ("".equals(messages.getLocale().getLanguage())) {
+      log.debug("Using locale 'default'.");
+    } else {
+      log.debug("Using locale '{}'.", messages.getLocale());
+    }
 	}
 
 	protected int initButtonSize() {