Author: bleny Date: 2011-01-25 16:13:40 +0000 (Tue, 25 Jan 2011) New Revision: 943 Log: add district name for non-french districts Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-25 14:37:48 UTC (rev 942) +++ trunk/pom.xml 2011-01-25 16:13:40 UTC (rev 943) @@ -328,10 +328,10 @@ <labs.id>154</labs.id> <!-- libraries version --> - <nuitonI18nVersion>2.1</nuitonI18nVersion> + <nuitonI18nVersion>2.2</nuitonI18nVersion> <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>1.0-SNAPSHOT</nuitonWebVersion> - <topiaVersion>2.5</topiaVersion> + <topiaVersion>2.5.1-SNAPSHOT</topiaVersion> <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-01-25 14:37:48 UTC (rev 942) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-01-25 16:13:40 UTC (rev 943) @@ -1,7 +1,10 @@ package fr.ifremer.wao.entity; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.LocationType; +import static org.nuiton.i18n.I18n.n_; + public class TerrestrialLocationImpl extends TerrestrialLocationAbstract { @Override @@ -18,6 +21,15 @@ } } + @Override + public String getDistrictName() { + String districtName = super.getDistrictName(); + if (districtName == null) { + districtName = WaoUtils.translate(n_("wao.business.other")); + } + return districtName; + } + public boolean isDistrict() { boolean isDistrict = getLocationType() == null; return isDistrict; Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-01-25 14:37:48 UTC (rev 942) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-01-25 16:13:40 UTC (rev 943) @@ -99,6 +99,7 @@ fr.ifremer.wao.entity.FishingGearDCF.TMS=Shrimp trawls fr.ifremer.wao.entity.FishingGearDCF.TX=Other trawls (not specified) fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified +wao.business.other=Other wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-01-25 14:37:48 UTC (rev 942) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-01-25 16:13:40 UTC (rev 943) @@ -111,6 +111,7 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques +wao.business.other=Autre wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s