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/models | |
| 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/models')
| -rw-r--r-- | 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 baab0719..44e44933 100644 --- a/src/main/java/com/gitblit/models/UserPreferences.java +++ b/src/main/java/com/gitblit/models/UserPreferences.java @@ -49,6 +49,12 @@ public class UserPreferences implements Serializable { 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); } |