From 0dc679ee461a45503d6ce0a99afbc059fd18b294 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Apr 2013 09:42:15 -0400
Subject: [PATCH] Merge branch 'force-locale' of https://github.com/ljader/gitblit
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 11 ++++++++++-
src/main/distrib/data/gitblit.properties | 6 ++++++
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 31b5272..6af132a 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -877,6 +877,12 @@
# RESTART REQUIRED
web.debugMode = false
+# Force default locale to all users, ignoring browser settings. Empty value delivers previous behavior.
+#
+# SINCE 1.3.0
+# RESTART REQUIRED
+web.forceDefaultLocale =
+
# Enable/disable global regex substitutions (i.e. shared across repositories)
#
# SINCE 0.5.0
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 2300d0f..74b8055 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -15,6 +15,8 @@
*/
package com.gitblit.wicket;
+import java.util.Locale;
+
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.Request;
@@ -25,6 +27,7 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.pages.ActivityPage;
import com.gitblit.wicket.pages.BlamePage;
import com.gitblit.wicket.pages.BlobDiffPage;
@@ -143,7 +146,13 @@
@Override
public final Session newSession(Request request, Response response) {
- return new GitBlitWebSession(request);
+ GitBlitWebSession gitBlitWebSession = new GitBlitWebSession(request);
+
+ String forcedLocale = GitBlit.getString(Keys.web.forceDefaultLocale, null);
+ if (!StringUtils.isEmpty(forcedLocale)) {
+ gitBlitWebSession.setLocale(new Locale(forcedLocale));
+ }
+ return gitBlitWebSession;
}
@Override
--
Gitblit v1.9.1