RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show languages sorted in settings page

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-08-30 19:57:22 +02:00
parent fe26a272b0
commit dbb35d678f
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
View file

@ -21,15 +21,18 @@ package org.navalplanner.web.users.settings;
import static org.navalplanner.web.I18nHelper._;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.settings.entities.Language;
import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.ListitemRenderer;
import org.zkoss.zul.Textbox;
@ -66,8 +69,21 @@ public class SettingsController extends GenericForwardComposer {
settingsModel.initEditLoggedUser();
}
public Language[] getLanguages() {
return Language.values();
public List<Language> getLanguages() {
List<Language> languages = Arrays.asList(Language.values());
Collections.sort(languages, new Comparator<Language>() {
@Override
public int compare(Language o1, Language o2) {
if (o1.equals(Language.BROWSER_LANGUAGE)) {
return -1;
}
if (o2.equals(Language.BROWSER_LANGUAGE)) {
return 1;
}
return _(o1.getDisplayName()).compareTo(_(o2.getDisplayName()));
}
});
return languages;
}
public boolean save() {