From b963f105c6a95303271bb0f744bf228fbba030aa Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Tue, 23 Jul 2013 19:56:36 -0400
Subject: [PATCH] Merge branch 'update-lang-ptbr-20130723'
---
src/main/java/com/gitblit/wicket/GitBlitWebSession.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebSession.java b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
index 5195a1f..f25bcf9 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -120,6 +121,13 @@
public void setUser(UserModel user) {
this.user = user;
+ if (user != null) {
+ Locale preferredLocale = user.getPreferences().getLocale();
+ if (preferredLocale != null) {
+ // set the user's preferred locale
+ setLocale(preferredLocale);
+ }
+ }
}
public TimeZone getTimezone() {
--
Gitblit v1.9.1