diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-05 10:20:59 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-05 10:20:59 -0400 |
| commit | 6537deb8b76b7a4725c40a174a7c440385f88e51 (patch) | |
| tree | 78399974a6de9599e63373459e90da41fd16532d /src/main/java/com/gitblit/ConfigUserService.java | |
| parent | 05f229883c4e15e044c5c103acf69265cfb8806e (diff) | |
| download | gitblit-6537deb8b76b7a4725c40a174a7c440385f88e51.tar.gz gitblit-6537deb8b76b7a4725c40a174a7c440385f88e51.zip | |
Revise language/locale preference handling
Diffstat (limited to 'src/main/java/com/gitblit/ConfigUserService.java')
| -rw-r--r-- | src/main/java/com/gitblit/ConfigUserService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java index 9b4dd7f1..b5dfde3b 100644 --- a/src/main/java/com/gitblit/ConfigUserService.java +++ b/src/main/java/com/gitblit/ConfigUserService.java @@ -707,8 +707,9 @@ public class ConfigUserService implements IUserService { config.setBoolean(USER, model.username, DISABLED, true);
}
if (model.getPreferences() != null) {
- if (!StringUtils.isEmpty(model.getPreferences().locale)) {
- config.setString(USER, model.username, LOCALE, model.getPreferences().locale);
+ if (model.getPreferences().getLocale() != null) {
+ String val = model.getPreferences().getLocale().getLanguage() + "_" + model.getPreferences().getLocale().getCountry();
+ config.setString(USER, model.username, LOCALE, val);
}
}
@@ -880,11 +881,13 @@ public class ConfigUserService implements IUserService { user.stateProvince = config.getString(USER, username, STATEPROVINCE);
user.countryCode = config.getString(USER, username, COUNTRYCODE);
user.cookie = config.getString(USER, username, COOKIE);
- user.getPreferences().locale = config.getString(USER, username, LOCALE);
if (StringUtils.isEmpty(user.cookie) && !StringUtils.isEmpty(user.password)) {
user.cookie = StringUtils.getSHA1(user.username + user.password);
}
+ // preferences
+ user.getPreferences().setLocale(config.getString(USER, username, LOCALE));
+
// user roles
Set<String> roles = new HashSet<String>(Arrays.asList(config.getStringList(
USER, username, ROLE)));
|