Changeset 743:a510522288ce

Timestamp:

10/12/09 15:26:46 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@744

Message:

added availableLocales to the context (TreeMap? returned by Language.getAvailableLocales())
+Capitalizes language display names

Files:

• src/org/w3c/unicorn/action/LanguageAction.java (modified) (6 diffs)

src/org/w3c/unicorn/action/LanguageAction.java

@@ -1 @@
-// $Id: LanguageAction.java,v 1.11 2009-10-12 13:14:34 tgambet Exp $
+// $Id: LanguageAction.java,v 1.12 2009-10-12 15:26:46 tgambet Exp $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -21 +21 @@
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -48 +49 @@
         
         private static TreeMap<String, String> defaultProperties = new TreeMap<String, String>();
+        
+        private static TreeMap<String, String> availableLocales;
 
         /**
@@ -77 +80 @@
                 velocityContext.put("messages", messages);
                 velocityContext.put("baseUri", "./");
+                velocityContext.put("availableLocales", availableLocales);
+                
                 
                 Hashtable<String, String> languages = new Hashtable<String, String>();
@@ -235 +240 @@
                         return null;
                 props.put("lang", locale.getLanguage());
-                props.put("language", locale.getDisplayLanguage(locale));
+                props.put("language", StringUtils.capitalize(locale.getDisplayLanguage(locale)));
                 return props;
         }
@@ -266 +271 @@
         }
 
+        public static TreeMap<String, String> getAvailableLocales() {
+                return availableLocales;
+        }
+
+        public static void setAvailableLocales(TreeMap<String, String> availableLocales) {
+                LanguageAction.availableLocales = availableLocales;
+        }
+
 }