Author: tchemit Date: 2014-03-26 18:16:44 +0100 (Wed, 26 Mar 2014) New Revision: 1762 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1762 Log: use I18nAble in FilterValues Modified: 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/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-26 17:14:02 UTC (rev 1761) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-26 17:16:44 UTC (rev 1762) @@ -53,11 +53,9 @@ terrestrialDistricts.put(terrestrialDistrict.getTopiaId(), terrestrialDistrict.getDescription()); } for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - String i18nKey = "fr.ifremer.wao.entity.FishingGearDCF." + dcf5Code.getFishingGearDCF().getCode(); - fishingGearDcfs.put(dcf5Code.getFishingGearDCF().getTopiaId(), i18nKey); + fishingGearDcfs.put(dcf5Code.getFishingGearDCF().getTopiaId(), dcf5Code.getFishingGearDCF().getI18nKey()); if (dcf5Code.getTargetSpeciesDCF() != null) { - i18nKey = "fr.ifremer.wao.entity.TargetSpeciesDCF." + dcf5Code.getTargetSpeciesDCF().getCode(); - targetSpeciesDcfs.put(dcf5Code.getTargetSpeciesDCF().getTopiaId(), i18nKey); + targetSpeciesDcfs.put(dcf5Code.getTargetSpeciesDCF().getTopiaId(), dcf5Code.getTargetSpeciesDCF().getI18nKey()); } } }