commit b37dee7c0de82d51042e64e62db3a86389c7a38e
author Valentin Valchev <vvalchev@apache.org> Thu Sep 23 13:14:06 2010 +0000
committer Valentin Valchev <vvalchev@apache.org> Thu Sep 23 13:14:06 2010 +0000
tree 9cb63771719fff0c56b3fc51a43b4e10519c6435
parent 04d5eeedd1688435f6f145f0f28c963ec00ec53a

Fixed FELIX-2617 /webconsole has option to change the language but doesn't show the currently selected one/
https://issues.apache.org/jira/browse/FELIX-2617

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1000453 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
index 7eba3e0..7e83dd5 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
@@ -632,22 +632,34 @@
         Map langMap = (Map) request.getAttribute(WebConsoleConstants.ATTR_LANG_MAP);
         if (null != langMap && !langMap.isEmpty())
         {
+            // determine the currently selected locale from the request and fail-back
+            // to the default locale if not set
+            // if locale is missing in locale map, the default 'en' locale is used
+            Locale reqLocale = request.getLocale();
+            String locale = null != reqLocale ? reqLocale.getLanguage()
+                : Locale.getDefault().getLanguage();
+            if (!langMap.containsKey(locale))
+            {
+                locale = Locale.getDefault().getLanguage();
+            }
+            if (!langMap.containsKey(locale))
+            {
+                locale = "en"; //$NON-NLS-1$
+            }
+
             pw.println("<div id='langSelect'>"); //$NON-NLS-1$
-            pw.println(" <span class='ui-icon ui-icon-comment'>&nbsp;</span>"); //$NON-NLS-1$
+            pw.println(" <span>"); //$NON-NLS-1$
+            printLocaleElement(pw, appRoot, locale, langMap.get(locale));
+            pw.println(" </span>"); //$NON-NLS-1$
             pw.println(" <span class='flags ui-helper-hidden'>"); //$NON-NLS-1$
             for (Iterator li = langMap.keySet().iterator(); li.hasNext();)
             {
                 // <img src="us.gif" alt="en" title="English"/>
                 final Object l = li.next();
-                pw.print("  <img src='"); //$NON-NLS-1$
-                pw.print(appRoot);
-                pw.print("/res/flags/"); //$NON-NLS-1$
-                pw.print(l);
-                pw.print(".gif' alt='"); //$NON-NLS-1$
-                pw.print(l);
-                pw.print("' title='"); //$NON-NLS-1$
-                pw.print(langMap.get(l));
-                pw.println("'/>"); //$NON-NLS-1$
+                if (!l.equals(locale))
+                {
+                    printLocaleElement(pw, appRoot, l, langMap.get(l));
+                }
             }
 
             pw.println(" </span>"); //$NON-NLS-1$
@@ -655,6 +667,19 @@
         }
     }
 
+    private static final void printLocaleElement(PrintWriter pw, String appRoot,
+        Object langCode, Object langName)
+    {
+        pw.print("  <img src='"); //$NON-NLS-1$
+        pw.print(appRoot);
+        pw.print("/res/flags/"); //$NON-NLS-1$
+        pw.print(langCode);
+        pw.print(".gif' alt='"); //$NON-NLS-1$
+        pw.print(langCode);
+        pw.print("' title='"); //$NON-NLS-1$
+        pw.print(langName);
+        pw.println("'/>"); //$NON-NLS-1$
+    }
 
     /**
      * This method is responsible for generating the footer of the page.