diff options
| author | James Moger <james.moger@gitblit.com> | 2014-04-28 12:44:38 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-04-28 12:44:38 -0400 |
| commit | a8100bb4d3aa64e254e92e29130e8fd9bd4e0dd2 (patch) | |
| tree | 26d4dc5aad3ad3d72a53f19715e375ea1ba324a6 /src/main/java/com/gitblit/wicket/GitBlitWebApp.java | |
| parent | 3e3581286bdf064cabb46b2c30bca73e6a78ea58 (diff) | |
| download | gitblit-a8100bb4d3aa64e254e92e29130e8fd9bd4e0dd2.tar.gz gitblit-a8100bb4d3aa64e254e92e29130e8fd9bd4e0dd2.zip | |
Fix forcing default locale to en or LANG_CC for web ui
Diffstat (limited to 'src/main/java/com/gitblit/wicket/GitBlitWebApp.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index 58fc5b7a..c4fdeda5 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -41,7 +41,6 @@ import com.gitblit.manager.IRuntimeManager; import com.gitblit.manager.IUserManager; import com.gitblit.tickets.ITicketService; import com.gitblit.transport.ssh.IPublicKeyManager; -import com.gitblit.utils.StringUtils; import com.gitblit.wicket.pages.ActivityPage; import com.gitblit.wicket.pages.BlamePage; import com.gitblit.wicket.pages.BlobDiffPage; @@ -242,9 +241,9 @@ public class GitBlitWebApp extends WebApplication { public final Session newSession(Request request, Response response) { GitBlitWebSession gitBlitWebSession = new GitBlitWebSession(request); - String forcedLocale = settings.getString(Keys.web.forceDefaultLocale, null); - if (!StringUtils.isEmpty(forcedLocale)) { - gitBlitWebSession.setLocale(new Locale(forcedLocale)); + Locale forcedLocale = runtime().getLocale(); + if (forcedLocale != null) { + gitBlitWebSession.setLocale(forcedLocale); } return gitBlitWebSession; } |