[Yanel-commits] rev 23877 - public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-04-19 15:29:52 +0200 (Thu, 19 Apr 2007)
New Revision: 23877

Modified:
   public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
Log:
get language from translation manager

Modified: public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
===================================================================
--- public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2007-04-19 13:18:58 UTC (rev 23876)
+++ public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2007-04-19 13:29:52 UTC (rev 23877)
@@ -202,21 +202,32 @@
     }
 
     /**
-     * Get language with the following priorization: 1) yanel.meta.language query string parameter, 2) Resource Configuration property, 3) Accept-Language header, 4) Default language or realm
+     * Get language with the following priorization: 
+     * 1) yanel.meta.language query string parameter 
+     * 2) Translation Manager
+     * 3) Resource Configuration property 
+     * 4) Accept-Language header
+     * 5) Realm default language
+     * 6) Default "en"
      */
     private String getRequestedLanguage() throws Exception {
         // TODO: Make this reusable. Also see org/wyona/yanel/servlet/YanelServlet.java
         String language = getRequest().getParameter("yanel.meta.language");
+        
+        if (language == null) {
+            language = getLanguage(); // get language from translation manager 
+        }
 
-        ResourceConfiguration rc = getConfiguration();
-        if (rc != null) {
-            language = rc.getProperty("language");
+        if (language == null) {
+            ResourceConfiguration rc = getConfiguration();
+            if (rc != null) {
+                language = rc.getProperty("language");
+            }
         }
 
         if (language == null) {
             language = getRequest().getHeader("Accept-Language");
             if (language != null) {
-                log.error("DEBUG: Use Accept-Language from Request Header: " + language);
                 if (language.indexOf(",") > 0) {
                     language = language.substring(0, language.indexOf(","));
                 }
@@ -226,8 +237,16 @@
                 }
             }
         }
-        if(language != null && language.length() > 0) return language;
-        return getRealm().getDefaultLanguage();
+        
+        if (language == null) {
+            language = getRealm().getDefaultLanguage();
+        }
+        
+        if (language == null || language.length() == 0) {
+            language = "en";
+        }
+        
+        return language;
     }