Author: tchemit Date: 2014-04-03 19:44:46 +0200 (Thu, 03 Apr 2014) New Revision: 1830 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1830 Log: use locale to translate enums Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java 2014-04-03 17:43:51 UTC (rev 1829) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java 2014-04-03 17:44:46 UTC (rev 1830) @@ -4,7 +4,10 @@ import fr.ifremer.wao.entity.I18nAble; import java.io.Serializable; +import java.util.Locale; +import static org.nuiton.i18n.I18n.l; + public class FilterOption implements Comparable<FilterOption>, Serializable { private static final long serialVersionUID = 1L; @@ -24,8 +27,8 @@ /** * Both label and value is the given str. */ - public static <T extends Enum & I18nAble> FilterOption forEnum(T enumValue) { - FilterOption filterOption = new FilterOption(enumValue.name(), enumValue.getI18nKey()); + public static <T extends Enum & I18nAble> FilterOption forEnum(Locale locale, T enumValue) { + FilterOption filterOption = new FilterOption(enumValue.name(), l(locale, enumValue.getI18nKey())); return filterOption; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-03 17:43:51 UTC (rev 1829) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-03 17:44:46 UTC (rev 1830) @@ -63,7 +63,7 @@ if (company != null) { companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); } - samplingStrategies.add(FilterOption.forEnum(sampleRow.getSamplingStrategy())); + samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); if (sampleRow.getObsProgram().isObsVente()) { TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); terrestrialDistricts.add(