From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.

---
 src/main/java/com/gitblit/models/UserPreferences.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index baab071..44e4493 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -49,6 +49,12 @@
 		if (StringUtils.isEmpty(locale)) {
 			return null;
 		}
+		int underscore = locale.indexOf('_');
+		if (underscore > 0) {
+			String lang = locale.substring(0, underscore);
+			String cc = locale.substring(underscore + 1);
+			return new Locale(lang, cc);
+		}
 		return new Locale(locale);
 	}
 

--
Gitblit v1.9.1