portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages JetspeedTemplatePage.java
Date Thu, 08 Mar 2001 17:11:49 GMT
ingo        01/03/08 09:11:47

  Modified:    src/java/org/apache/jetspeed/modules/pages
                        JetspeedTemplatePage.java
  Log:
  [MLS] Multi- markup & language support. First "simple" implementation.
  temporary fix until next TDK
  
  Revision  Changes    Path
  1.5       +16 -1     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java
  
  Index: JetspeedTemplatePage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JetspeedTemplatePage.java	2001/03/08 16:26:43	1.4
  +++ JetspeedTemplatePage.java	2001/03/08 17:11:41	1.5
  @@ -72,6 +72,11 @@
   import org.apache.jetspeed.capability.CapabilityMap;
   import org.apache.jetspeed.capability.CapabilityMapFactory;
   
  +
  +//<Temporary FIX: new turbine will make it obsolete>        
  +import org.apache.turbine.services.localization.LocaleDetector;
  +//</Temporary FIX: new turbine will make it obsolete>        
  +
   /**
    * When building sites using templates, Screens need only be defined
    * for templates which require dynamic (database or object) data.
  @@ -120,7 +125,7 @@
    *
    * @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: JetspeedTemplatePage.java,v 1.4 2001/03/08 16:26:43 ingo Exp $
  + * @version $Id: JetspeedTemplatePage.java,v 1.5 2001/03/08 17:11:41 ingo Exp $
    */
   public class JetspeedTemplatePage extends DefaultPage
   {
  @@ -139,6 +144,16 @@
           // is hardcoded into the Screen in this instance.  In this case this
           // action is skipped.
   
  +//<Temporary FIX: new turbine will make it obsolete>        
  +        // Get the locale store it in the user object
  +        Locale tmplocale = LocaleDetector.getLocale(data);
  +        if (tmplocale == null) {
  +            tmplocale = new Locale(
  +                     TurbineResources.getString("locale.default.language", "en"),
  +                     TurbineResources.getString("locale.default.country", "US"));
  +        }
  +       	data.getUser().setTemp("locale", tmplocale);
  +//</Temporary FIX>        
           if ( data.hasScreen() )
               data.setScreenTemplate( "Ecs" );
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message