Fix user preferences selecting the wrong preferred locale.

Due to a wrong comparison, when loading the preferred locale in the
user preferences page, in cases like `zh_CN` or `de_DE` the wrong
locale would be chosen.

As with too many things, the code is duplicated on the `UserPage`
and the `EditUserPage`. And they differ. So extract the choosing of
the preferred language for display into a method in the (more up-to-date)
`UserPage` and call that from the `EditUserPage`.

1 files changed, 3 insertions, 22 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 5b0b0147..c6014e8f 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@ -112,30 +112,11 @@ public class EditUserPage extends RootSubPage {
 		final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(

 				new ArrayList<String>(userTeams)), new CollectionModel<String>(app().users()

 				.getAllTeamNames()), new StringChoiceRenderer(), 10, false);

-		Locale locale = userModel.getPreferences().getLocale();

-		if (locale == null) {

-			locale = Locale.ENGLISH;

-		}

 

+		Locale locale = userModel.getPreferences().getLocale();

 		List<Language> languages = UserPage.getLanguages();

-		Language preferredLanguage = null;

-		if (locale != null) {

-			String localeCode = locale.getLanguage();

-			if (!StringUtils.isEmpty(locale.getCountry())) {

-				localeCode += "_" + locale.getCountry();

-			}

-

-			for (Language lang : languages) {

-				if (lang.code.equals(localeCode)) {

-					// language_COUNTRY match

-					preferredLanguage = lang;

-				} else if (preferredLanguage != null && lang.code.startsWith(locale.getLanguage())) {

-					// language match

-					preferredLanguage = lang;

-				}

-			}

-		}

-		final IModel<Language> language = Model.of(preferredLanguage);		

+		Language preferredLanguage = UserPage.getPreferredLanguage(locale, languages);

+		final IModel<Language> language = Model.of(preferredLanguage);

 		Form<UserModel> form = new Form<UserModel>("editForm", model) {

 

 			private static final long serialVersionUID = 1L;