1 files changed, 39 insertions, 25 deletions
diff --git a/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java b/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java
index 1db7e3b..c610e42 100644
--- a/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java
+++ b/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java
@@ -18,9 +18,10 @@ import com.opensymphony.module.sitemesh.mapper.DefaultDecorator;
 
 public class LanguageDecoratorMapper extends AbstractDecoratorMapper {
    
-   public static final String LOCALE_SESSION_KEY = "at.gv.egiz.pdfas.web.i18n:currentLocale";
    
-   private Logger log = Logger.getLogger(LanguageDecoratorMapper.class);
+   private String decoratorParameter = null;
+   
+   private static final Logger LOG = Logger.getLogger(LanguageDecoratorMapper.class);
 
    public void init(Config config, Properties properties, DecoratorMapper parent) throws InstantiationException {
       super.init(config, properties, parent);
@@ -37,29 +38,42 @@ public class LanguageDecoratorMapper extends AbstractDecoratorMapper {
       }
       return null;
    }
+   
+   public static Locale getLocale(HttpServletRequest request, String decoratorParameter) {
+      Locale locale = null;
+      HttpSession session = request.getSession();
+      
+      LOG.trace("Looking for locale in session (ID=" + session.getId() + ").");
+      locale = (Locale) session.getAttribute(LocaleParamFilter.LOCALE_SESSION_KEY);
+      if (locale == null) {
+         LOG.debug("Unable to find locale in session. Trying to create new locale based on Accept-Language header entry.");
+         String acceptLanguage = request.getHeader("Accept-Language");
+         if (acceptLanguage != null) {
+            LOG.trace("Accept-Language header entry: " + acceptLanguage);
+         } else {
+            LOG.trace("No header entry found.");
+         }
+         if (acceptLanguage != null && acceptLanguage.length() >= 2) {
+            locale = new Locale(acceptLanguage.substring(0, 2));
+            LOG.debug("New Locale created: " + locale);
+            LOG.trace("Setting language to " + locale.getDisplayLanguage() + ".");
+            session.setAttribute(LocaleParamFilter.LOCALE_SESSION_KEY, locale);
+         }
+      } else {
+         LOG.debug("Locale found: " + locale);
+      }
+
+      return locale;
+   }
 
    public Decorator getDecorator(HttpServletRequest request, Page page) {
+      LOG.trace("SiteMesh language resource decorator mapper invoked.");
+      
       try {
          Decorator result = null;
          final Decorator d = super.getDecorator(request, page);
-         HttpSession session = request.getSession();
-         log.trace("Looking for Locale in session.");
-         Locale locale = (Locale) session.getAttribute(LOCALE_SESSION_KEY);
-         if (locale == null) {
-            log.debug("Unable to find Locale in session. Creating new Locale based on Accept-Language header entry.");
-            String acceptLanguage = request.getHeader("Accept-Language");
-            if (acceptLanguage != null) {
-               log.trace("Accept-Language header entry: " + acceptLanguage);
-            } else {
-               log.trace("No header entry found.");
-            }
-            if (acceptLanguage != null && acceptLanguage.length() >= 2) {
-               locale = new Locale(acceptLanguage.substring(0, 2));
-               log.debug("New Locale created: " + locale);
-            }
-         } else {
-            log.debug("Locale found: " + locale);
-         }
+         Locale locale = getLocale(request, this.decoratorParameter);
+         
          String path;
          if (locale != null) {
             path = modifyPath(d.getPage(), locale.getLanguage());
@@ -69,7 +83,7 @@ public class LanguageDecoratorMapper extends AbstractDecoratorMapper {
 
          File decFile = new File(config.getServletContext().getRealPath(path));
          
-         log.debug("Looking for decorator \"" + path + "\".");
+         LOG.debug("Looking for decorator \"" + path + "\".");
          if (decFile.isFile()) {
             result = new DefaultDecorator(d.getName(), path, null) {
                public String getInitParameter(String paramName) {
@@ -79,15 +93,15 @@ public class LanguageDecoratorMapper extends AbstractDecoratorMapper {
          }
 
          if (result != null) {
-            log.debug("Decorator found (\"" + result.getName() + "\", \"" + getFirstNotNull(new Object[] { result.getURIPath(), result.getPage(), "<n/a>"}) + "\").");
+            LOG.debug("Decorator found (\"" + result.getName() + "\", \"" + getFirstNotNull(new Object[] { result.getURIPath(), result.getPage(), "<n/a>"}) + "\").");
             return result;
          } else {
-            log.trace("No decorator found. Delegating to super class.");
+            LOG.trace("No decorator found. Delegating to super class.");
             result = super.getDecorator(request, page);
             if (result != null) {
-               log.debug("Super class returned decorator (\"" + result.getName() + "\", \"" + getFirstNotNull(new Object[] { result.getURIPath(), result.getPage(), "<n/a>"}) + "\").");
+               LOG.debug("Super class returned decorator (\"" + result.getName() + "\", \"" + getFirstNotNull(new Object[] { result.getURIPath(), result.getPage(), "<n/a>"}) + "\").");
             } else {
-               log.trace("Super class did not return a decorator.");
+               LOG.trace("Super class did not return a decorator.");
             }
             return result;
          }