From 07eb0963cae3a403f8774f65afa20c940ce7124f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jun 2014 08:57:41 -0400
Subject: [PATCH] Merged #103 "flotr2 throws exception on small dashboards"
---
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