Author: chatellier Date: 2011-02-22 13:18:33 +0000 (Tue, 22 Feb 2011) New Revision: 758 Log: Fix i18n Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-02-22 13:18:33 UTC (rev 758) @@ -214,7 +214,7 @@ if (frHeaders != null) { if (!Arrays.equals(line, enHeaders) && !Arrays.equals(line, frHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Find : %s, expected %s or %s", + throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s or %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(frHeaders, ", "), @@ -223,7 +223,7 @@ } else { if (!Arrays.equals(line, enHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Find : %s, expected %s", + throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(enHeaders, ", "))); Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -16,8 +16,8 @@ Project\ %s\ doesn't\ exists\ \!= Selection\ %s\ already\ exists= Species\ %s\ doesn't\ exist\ in\ referential= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s\nor\n\t%s age\ attribute\ is\ not\ a\ valid\ double= coser.business.category.catch=Catch coser.business.category.haul=Haul Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -16,8 +16,8 @@ Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! Species\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. age\ attribute\ is\ not\ a\ valid\ double=L'attribut Age n'est pas un r\u00E9el valide coser.business.category.catch=Captures coser.business.category.haul=Traits Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -58,8 +58,8 @@ coser.ui.control.validcontroltip=Mark control as validated. Can be done only after data check ended without errors. coser.ui.error.htmlReportCantBeOpened=HTML report as been generated in \:\n%s\nbut it can't be opened because default system browser in undefined \! coser.ui.error.htmlReportError=Open error -coser.ui.error.htmlmessage=An error occurs \: %s -coser.ui.error.reportSendTo=A repport has been sent to %s +coser.ui.error.htmlmessage=An error occurred \: %s +coser.ui.error.reportSendTo=A report has been sent to %s coser.ui.error.title=Global application error coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check)