Author: bleny Date: 2010-11-02 17:00:31 +0000 (Tue, 02 Nov 2010) New Revision: 724 Log: add i18n UI representation of global indicator value Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.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 trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-02 17:00:31 UTC (rev 724) @@ -1,16 +1,26 @@ package fr.ifremer.wao.bean; +import static org.nuiton.i18n.I18n._; + public enum GlobalIndicatorValue { - VERY_BAD, + VERY_BAD("wao.business.bean.GlobalIndicatorValue.very_bad"), - BAD, + BAD("wao.business.bean.GlobalIndicatorValue.bad"), - NEUTRAL, + NEUTRAL("wao.business.bean.GlobalIndicatorValue.neutral"), - GOOD, + GOOD("wao.business.bean.GlobalIndicatorValue.good"), - VERY_GOOD; + VERY_GOOD("wao.business.bean.GlobalIndicatorValue.very_good"); + protected String label; + GlobalIndicatorValue(String label) { + this.label = label; + } + + public String getLabel() { + return _(label); + } } 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 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-02 17:00:31 UTC (rev 724) @@ -2,6 +2,11 @@ wao.business.bean.DataReliability.not_reliable=not reliable wao.business.bean.DataReliability.reliable=reliable wao.business.bean.DataReliability.unknown=unknown +wao.business.bean.GlobalIndicatorValue.bad= +wao.business.bean.GlobalIndicatorValue.good= +wao.business.bean.GlobalIndicatorValue.neutral= +wao.business.bean.GlobalIndicatorValue.very_bad= +wao.business.bean.GlobalIndicatorValue.very_good= wao.business.bean.SynthesisId.allegro_reactivity= wao.business.bean.SynthesisId.compliance_boarding= wao.business.bean.SynthesisId.contact_state= 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 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-02 17:00:31 UTC (rev 724) @@ -2,6 +2,11 @@ wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=non renseign\u00E9e +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 1 +wao.business.bean.GlobalIndicatorValue.good=Bonus 1 +wao.business.bean.GlobalIndicatorValue.neutral=Rien \u00E0 signaler +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 2 +wao.business.bean.GlobalIndicatorValue.very_good=Bonus 2 wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 17:00:31 UTC (rev 724) @@ -368,11 +368,11 @@ <t:loop t:source="globalLevels" t:value="globalLevel"> <t:if test="highlightGlobalLevel()"> <td class="highlight selected"> - ${globalLevel} + ${globalLevel.label} </td> <p:else> <td> - ${globalLevel} + ${globalLevel.label} </td> </p:else> </t:if>