Overwrite created session locale with forced one

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 2300d0ff30beeea03410d50b229032b4b71b3bae..74b80551597edd30f6aa7abcb9595e39bbbd878a 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -15,6 +15,8 @@
  */\r
 package com.gitblit.wicket;\r
 \r
+import java.util.Locale;\r
+\r
 import org.apache.wicket.Application;\r
 import org.apache.wicket.Page;\r
 import org.apache.wicket.Request;\r
@@ -25,6 +27,7 @@ import org.apache.wicket.protocol.http.WebApplication;
 \r
 import com.gitblit.GitBlit;\r
 import com.gitblit.Keys;\r
+import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.pages.ActivityPage;\r
 import com.gitblit.wicket.pages.BlamePage;\r
 import com.gitblit.wicket.pages.BlobDiffPage;\r
@@ -143,7 +146,13 @@ public class GitBlitWebApp extends WebApplication {
        \r
        @Override\r
        public final Session newSession(Request request, Response response) {\r
-               return new GitBlitWebSession(request);\r
+               GitBlitWebSession gitBlitWebSession = new GitBlitWebSession(request);\r
+\r
+               String forcedLocale = GitBlit.getString(Keys.web.forceDefaultLocale, null);\r
+               if (!StringUtils.isEmpty(forcedLocale)) {\r
+                       gitBlitWebSession.setLocale(new Locale(forcedLocale));\r
+               }\r
+               return gitBlitWebSession;\r
        }\r
 \r
        @Override\r