svn commit: r425867 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util: ParsedRequest.java PlanetRequest.java

[ag...@apache.org]

Author: agilliland
Date: Wed Jul 26 15:01:57 2006
New Revision: 425867

URL: http://svn.apache.org/viewvc?rev=425867&view=rev
Log:
getLanguage() is no longer a standard part of ParsedRequest.

PlanetRequest still uses language, which is based off browser settings.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java?rev=425867&r1=425866&r2=425867&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/ParsedRequest.java Wed Jul 26 15:01:57 2006
@@ -20,7 +20,6 @@
 
 import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.roller.ui.core.LanguageUtil;
 
 
 /**
@@ -62,19 +61,6 @@
             this.authenticUser = prince.getName();
         }
         
-    }
-    
-    
-    public String getLanguage() {
-        if(this.language == null) {
-            // determine language
-            // this operation can possibly require a trip to the db, so we only
-            // do it when we know our user needs to know the language
-            Locale locale = LanguageUtil.getViewLocale(request);
-            this.language = locale.getLanguage();
-        }
-        
-        return this.language;
     }
     
     

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java?rev=425867&r1=425866&r2=425867&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/util/PlanetRequest.java Wed Jul 26 15:01:57 2006
@@ -30,12 +30,13 @@
  */
 public class PlanetRequest extends ParsedRequest {
     
-    private static Log mLogger = LogFactory.getLog(PlanetRequest.class);
+    private static Log log = LogFactory.getLog(PlanetRequest.class);
     
     private String context = null;
     private String type = null;
     private String flavor = null;
     private boolean excerpts = false;
+    private String language = null;
     
     
     /**
@@ -46,7 +47,7 @@
         super(request);
         
         // parse the request object and figure out what we've got
-        mLogger.debug("parsing url "+request.getRequestURL());
+        log.debug("parsing url "+request.getRequestURL());
         
         String servlet = request.getServletPath();
         
@@ -83,6 +84,9 @@
             this.excerpts = Boolean.valueOf(request.getParameter("excerpts")).booleanValue();
         }
         
+        
+        // language is always from the browser
+        language = request.getLocale().getLanguage();
     }
     
     
@@ -100,6 +104,14 @@
     
     public boolean isExcerpts() {
         return excerpts;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
     }
     
 }