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

michi at wyona.com michi at wyona.com
Tue Aug 23 11:47:59 CEST 2011


Author: michi
Date: 2011-08-23 11:47:59 +0200 (Tue, 23 Aug 2011)
New Revision: 60159

Modified:
   public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
Log:
match content language

Modified: public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
===================================================================
--- public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java	2011-08-23 09:47:24 UTC (rev 60158)
+++ public/yanel/trunk/src/resources/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java	2011-08-23 09:47:59 UTC (rev 60159)
@@ -222,9 +222,9 @@
     }
 
     /**
-     * Get language with the following priorization: 1) 'language' yanel request parameter (e.g. from within XSLT) 2) 'yanel.meta.language' regular HTTP request query string parameter, 3) Accept-Language header, 4) Default language of realm
+     * Get language with the following priorization: 1) 'language' yanel request parameter (e.g. from within XSLT) 2) 'yanel.meta.language' regular HTTP request query string parameter, 3) OPTIONAL (only if resource configuration parameter 'match-content-language' set to true): content language 4) Accept-Language header, 5) Default language of realm
      */
-    private String getLanguage() {
+    private String getLanguage() throws Exception {
         String language = null;
         if (getParameters() != null) {
             language = (String)getParameters().get("language");
@@ -234,6 +234,11 @@
             language = getRequest().getParameter("yanel.meta.language");
         }
 
+        String matchContentLanguage = getResourceConfigProperty("match-content-language"); // INFO: In order to stay backwards compatible we need such an optional flag
+        if (matchContentLanguage != null && matchContentLanguage.equals("true") && language == null) {
+            language = getContentLanguage();
+        }
+
         if (language == null) {
             language = getRequest().getParameter("Accept-Language");
         }



More information about the Yanel-commits mailing list