Author: bleny Date: 2011-02-15 17:18:43 +0000 (Tue, 15 Feb 2011) New Revision: 1014 Log: fix misc i18n issues Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-15 17:18:43 UTC (rev 1014) @@ -101,6 +101,16 @@ 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 +fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algae +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Catadromous species +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacean +fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Scallop +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Demersal species +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Deep water species +fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Flatfishes +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Tall pelagic +fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Molluscs +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Small pelagic wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating wao.business.entity.UserProfile.description=%s on %s%s Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-02-15 17:18:43 UTC (rev 1014) @@ -51,7 +51,7 @@ * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) public class Cartography { @SessionState Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-15 17:18:43 UTC (rev 1014) @@ -78,6 +78,8 @@ import java.util.Map; import java.util.SortedMap; +import static org.nuiton.i18n.I18n.n_; + /** * Synthesis * @@ -120,6 +122,9 @@ @InjectComponent private Zone delegator; + @Inject + private Messages messages; + void setupRender() { // make filters keep company between submissions initSelectFilters(true, false, true); @@ -315,12 +320,14 @@ public JFreeChart getDataSamplingChart() throws WaoException { List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); - data.put("Planifié", res.get(0)); + data.put(messages.get(n_("wao.ui.samplingPlan.expected")), res.get(0)); String realText = - getFilter().getEstimatedTides() ? "Estimé" : "Réalisé"; + getFilter().getEstimatedTides() ? messages.get(n_("wao.ui.samplingPlan.estimated")) + : messages.get(n_("wao.ui.samplingPlan.actual")); data.put(realText, res.get(1)); String title = manager.getDataSamplingTitle(getFilter()); - return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data); + return ChartUtils.createCategoryChart(title, messages.get(n_("wao.ui.chart.numberObservations")), + messages.get("wao.ui.samplingPlan.months"), getDataSamplingChartType(), data); } public ChartType getDataSamplingChartType() { @@ -359,19 +366,20 @@ Map<String, Map<?, Integer>> data = new LinkedHashMap<String, Map<?, Integer>>(); - // put invalid first to get red color - data.put("Nombre de navires ayant effectués x embarquements", getBoardingResult().getBoardings()); + data.put(messages.get(n_("wao.ui.chart.numberOfBoatsWithBoardings")), getBoardingResult().getBoardings()); - String title = "Sollicitations des navires depuis le " + - getDateFormat().format(getFilter().getPeriod().getFromDate()); + String title = String.format(messages.get(n_("wao.ui.chart.boardingsSince")), + getDateFormat().format(getFilter().getPeriod().getFromDate())); Company companyForBoarding = getFilter().getCompany(); if (companyForBoarding != null) { - title += "\nSociété " + companyForBoarding.getName(); + title += "\n" + messages.get("wao.ui.entity.Company") + " " + companyForBoarding.getName(); } - return ChartUtils.createCategoryChart(title, "Nb navires", - "Nb embarquements", ChartType.BAR, data); + return ChartUtils.createCategoryChart(title, + messages.get(n_("wao.ui.chart.numberBoats")), + messages.get(n_("wao.ui.chart.numberObservations")), + ChartType.BAR, data); } public BoardingResult getBoardingResult() throws WaoException { Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-15 17:18:43 UTC (rev 1014) @@ -46,6 +46,10 @@ wao.ui.boats.nbObservations=%s observation(s), %s with your company (all programs considered) wao.ui.cartography.title=Dispatching of the contacts among boat districts wao.ui.cartography.title.company=Dispatching of the contacts among boat districts for company %s +wao.ui.chart.boardingsSince=Queries since %s +wao.ui.chart.numberBoats=No. boats +wao.ui.chart.numberObservations=No. observations +wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x observations wao.ui.contact.lastContact=Last observation with this boat for your company wao.ui.contacts.createFromBoat=Create a new contact for this boat and this sample row wao.ui.contacts.createFromBoat.fail=Contact creation failed @@ -244,12 +248,12 @@ wao.ui.samplingPlan.showActual=Show realisez observations efforfor validated contacts only wao.ui.samplingPlan.showExpected=Show estimated observations effort for contacts validated by company or not wao.ui.samplingPlan.title=Sampling plan -wao.ui.synthesis.allegroReactivity.description=This result is an average of the number of days between the Allegro input date and the date of the observation end. -wao.ui.synthesis.allegroReactivity.title=Allegro input reactivity in relation to tide end date +wao.ui.synthesis.allegroReactivity.description=This result is an average of the number of days between the data input date and the date of the observation end. +wao.ui.synthesis.allegroReactivity.title=Data input reactivity wao.ui.synthesis.boarding.boardingCount=Total \: %s invalid boardings on %s boardings. wao.ui.synthesis.boarding.description=In these results, only sample rows with average tide time below 48 hours are considered. wao.ui.synthesis.boarding.mostUsedBoat=Most used boat with %s boardings \: %s (%s) -wao.ui.synthesis.boarding.title=Boatssolicitations +wao.ui.synthesis.boarding.title=Boats solicitations wao.ui.synthesis.complianceBoarding.description=Respect of the defined number of observants for each tides. wao.ui.synthesis.complianceBoarding.title=Respect of the number of observers wao.ui.synthesis.contactsStates.description=Theses results consider all contacts states except those that are refused by the program. Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-15 17:18:43 UTC (rev 1014) @@ -46,6 +46,10 @@ wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 wao.ui.cartography.title=R\u00E9partition des contacts par quartier des navires wao.ui.cartography.title.company=R\u00E9partition des contacts par quartier des navires pour la soci\u00E9t\u00E9 %s +wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s +wao.ui.chart.numberBoats=Nb navires +wao.ui.chart.numberObservations=Nb observations +wao.ui.chart.numberOfBoatsWithBoardings=Nombre de navires avec x embarquements wao.ui.contact.lastContact=Derni\u00E8re observation concernant ce navire pour votre soci\u00E9t\u00E9 (tous programmes confondus) wao.ui.contacts.createFromBoat=Cr\u00E9er un nouveau contact pour ce navire et cette ligne du plan wao.ui.contacts.createFromBoat.fail=Cr\u00E9ation d'un nouveau contact impossible Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-15 15:11:37 UTC (rev 1013) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-15 17:18:43 UTC (rev 1014) @@ -188,7 +188,7 @@ </p:else> </t:if> <t:if test="user.obsVente"> - <td class="width60 bright">${message:wao.ui.field.SampleRow.samplingStrategy}</td> + <td class="width60 bright">16 ${message:wao.ui.field.SampleRow.samplingStrategy}</td> </t:if> <t:loop source="months" value="month"> <td class="width50"><t:output value="month" format="dateFormat" /></td>