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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index e6baa28..44e4493 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -27,7 +27,7 @@
/**
* User preferences.
- *
+ *
* @author James Moger
*
*/
@@ -38,20 +38,26 @@
public final String username;
public String locale;
-
+
private final Map<String, UserRepositoryPreferences> repositoryPreferences = new TreeMap<String, UserRepositoryPreferences>();
public UserPreferences(String username) {
this.username = username;
}
-
+
public Locale getLocale() {
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);
}
-
+
public UserRepositoryPreferences getRepositoryPreferences(String repositoryName) {
String key = repositoryName.toLowerCase();
if (!repositoryPreferences.containsKey(key)) {
@@ -63,11 +69,11 @@
}
return repositoryPreferences.get(key);
}
-
+
public void setRepositoryPreferences(UserRepositoryPreferences pref) {
repositoryPreferences.put(pref.repositoryName.toLowerCase(), pref);
}
-
+
public boolean isStarredRepository(String repository) {
if (repositoryPreferences == null) {
return false;
@@ -79,7 +85,7 @@
}
return false;
}
-
+
public List<String> getStarredRepositories() {
List<String> list = new ArrayList<String>();
for (UserRepositoryPreferences prefs : repositoryPreferences.values()) {
--
Gitblit v1.9.1