[Yanel-commits] rev 26415 - public/yanel/trunk/src/core/java/org/wyona/yanel/core

[michi at wyona.com]

Author: michi
Date: 2007-07-31 14:41:07 +0200 (Tue, 31 Jul 2007)
New Revision: 26415

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java
Log:
languages cleaned

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java	2007-07-31 12:39:49 UTC (rev 26414)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java	2007-07-31 12:41:07 UTC (rev 26415)
@@ -264,7 +264,7 @@
         language = getResourceConfigProperty("language");
         if (language != null) return language;
 
-        return DEFAULT_LANGUAGE;
+        return getRequestedLanguage();
     }
 
     /**
@@ -283,22 +283,7 @@
         String language = getRequest().getParameter("yanel.meta.language");
         if (language != null) return language;
         
-/*
-        // TODO: Does this really belong here resp. shouldn't it be used with a different priority?
         // (2)
-        if (ResourceAttributeHelper.hasAttributeImplemented(this, "Translatable", "1")) {
-            language = ((TranslatableV1)this).getLanguage(); 
-        }
-        if (language != null) return language;
-*/
-
-/*
-        // (3)
-        language = getResourceConfigProperty("language");
-        if (language != null) return language;
-*/
-
-        // (4)
         language = getRequest().getHeader("Accept-Language");
         if (language != null) {
             if (language.indexOf(",") > 0) {
@@ -311,11 +296,11 @@
         }
         if (language != null) return language;
 
-        // (5)
+        // (3)
         language = getRealm().getDefaultLanguage();
         if (language != null) return language;
         
-        // (6)
+        // (4)
         return DEFAULT_LANGUAGE;
     }