November 2010 - Coser-commits - mailman.cloud.codelutin.com

r234 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 11:20:36 +0000 (Thu, 18 Nov 2010) New Revision: 234 Log: Fix detail message Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-18 11:13:25 UTC (rev 233) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-18 11:20:36 UTC (rev 234) @@ -657,7 +657,7 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.WARNING); error.setMessage(_("coser.business.control.error.diffCatchLength")); - error.setMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year)); + error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year)); validationErrors.add(error); } }

1 0

r233 - in trunk/coser-business/src: main/java/fr/ifremer/coser main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 11:13:25 +0000 (Thu, 18 Nov 2010) New Revision: 233 Log: Remove intermediate "data" dir for selections Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-18 11:13:25 UTC (rev 233) @@ -55,9 +55,6 @@ /** Nom du dossier de sauvegarde des selections. */ public static final String STORAGE_SELECTION_DIRECTORY = "selections"; - - /** Nom du dossier de sauvegarde des données d'une selections. */ - public static final String STORAGE_DATA_SELECTION_DIRECTORY = "data"; /** Suffix des nom de fichiers data apres control. */ public static final String STORAGE_CONTROL_SUFFIX = "_co"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-18 11:13:25 UTC (rev 233) @@ -487,13 +487,12 @@ // try to load validated data first File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); File selectionDirectory = new File(selectionsDirectory, selection.getName()); - File selectionDataDirectory = new File(selectionDirectory, CoserConstants.STORAGE_DATA_SELECTION_DIRECTORY); int fileLoaded = 0; for (Category category : Category.values()) { // seulement les category de données ici if (category.isDataCategory()) { - File inputFile = new File(selectionDataDirectory, category.getStorageFileName() + + File inputFile = new File(selectionDirectory, category.getStorageFileName() + CoserConstants.STORAGE_SELECTION_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); if (inputFile.isFile()) { @@ -698,13 +697,9 @@ // creation du dossier de la selection courante File selectionDirectory = new File(selectionsDirectory, selection.getName()); - // copie des données (csv) - File selectionDataDirectory = new File(selectionDirectory, CoserConstants.STORAGE_DATA_SELECTION_DIRECTORY); - selectionDataDirectory.mkdirs(); - for (Category category : Category.values()) { if (category.isDataCategory()) { - File dataFile = new File(selectionDataDirectory, + File dataFile = new File(selectionDirectory, category.getStorageFileName() + CoserConstants.STORAGE_SELECTION_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-18 11:13:25 UTC (rev 233) @@ -133,7 +133,7 @@ Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "selections" + File.separator + - "titi" + File.separator + "data" + File.separator + "catch_se.csv").exists()); + "titi" + File.separator + "catch_se.csv").exists()); } /**

1 0

r232 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 11:12:08 +0000 (Thu, 18 Nov 2010) New Revision: 232 Log: Fix test (empty regex pb) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-11-18 11:06:46 UTC (rev 231) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-11-18 11:12:08 UTC (rev 232) @@ -66,12 +66,12 @@ myCatch.setData(new String[]{"1", "","","","","",""}); List<ValidationError> errors = validationService.validate(myCatch, Category.CATCH); Assert.assertNotNull(errors); - Assert.assertEquals(3, errors.size()); + Assert.assertEquals(4, errors.size()); myCatch.setData(new String[]{"1", "Toto","","","","999",""}); errors = validationService.validate(myCatch, Category.CATCH); Assert.assertNotNull(errors); - Assert.assertEquals(2, errors.size()); + Assert.assertEquals(3, errors.size()); } /**

1 0

r231 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 11:06:46 +0000 (Thu, 18 Nov 2010) New Revision: 231 Log: Ajout du control de differences entre les captures et taille Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.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 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-18 11:05:04 UTC (rev 230) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-18 11:06:46 UTC (rev 231) @@ -35,6 +35,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.xwork.StringUtils; @@ -194,17 +196,8 @@ * @return les erreurs de validation */ public List<ValidationError> validateData(Project project, Control control, ProgressMonitor progress) { - - // compte le nombre de category a valider - int categoryCount = 0; - for (Category category : Category.values()) { - if (category.isDataCategory()) { - categoryCount++; - } - } - + // valide chaque category - int categoryIndex = 0; List<ValidationError> validationErrors = new ArrayList<ValidationError>(); for (Category category : Category.values()) { if (category.isDataCategory()) { @@ -221,6 +214,12 @@ } } + // validation entre catch et length (specific) + List<ValidationError> diffCatchLengthErrors = validateDiffCatchLength(control); + if (diffCatchLengthErrors != null) { + validationErrors.addAll(diffCatchLengthErrors); + } + // validation par croisement de fichiers List<ValidationError> crossFileErrors = validationCrossFiles(project, control, progress); if (crossFileErrors != null) { @@ -541,6 +540,133 @@ } /** + * Detecte des différences entre les nombres dans captures + * et les nombres dand taille. + * + * @see ChartService#getCompareCatchLengthGraph(Project, Control, String) for details + * @see CoserBusinessConfig#getControlDiffCatchLength() for option + * + * @return errors + */ + protected List<ValidationError> validateDiffCatchLength(Control control) { + + List<ValidationError> validationErrors = new ArrayList<ValidationError>(); + SortedSet<String> setYear = new TreeSet<String>(); + + // look for data (data summed over catch) + Map<String, Map<String, Double>> catchForSpeciesYears = new HashMap<String, Map<String, Double>>(); + Iterator<String[]> itCatchData = control.getCatch().iterator(); + itCatchData.next(); // header + while (itCatchData.hasNext()) { + String[] tuple = itCatchData.next(); + String species = tuple[Catch.INDEX_SPECIES]; + + Map<String, Double> speciesCatchForYears = catchForSpeciesYears.get(species); + if (speciesCatchForYears == null) { + speciesCatchForYears = new HashMap<String, Double>(); + catchForSpeciesYears.put(species, speciesCatchForYears); + } + + String year = tuple[Catch.INDEX_YEAR]; + setYear.add(year); + String nombreValue = tuple[Catch.INDEX_NUMBER]; + try { + Double nombreDouble = Double.valueOf(nombreValue); + + if (speciesCatchForYears.containsKey(year)) { + Double oldValue = speciesCatchForYears.get(year); + Double newValue = oldValue + nombreDouble; + speciesCatchForYears.put(year, newValue); + } + else { + speciesCatchForYears.put(year, nombreDouble); + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse " + nombreValue + " as double"); + } + } + } + + // look for data (data summed over length) + Map<String, Map<String, Double>> lengthForSpeciesYears = new HashMap<String, Map<String, Double>>(); + Iterator<String[]> itLengthData = control.getLength().iterator(); + itLengthData.next(); // header + while (itLengthData.hasNext()) { + String[] tuple = itLengthData.next(); + String species = tuple[Length.INDEX_SPECIES]; + + Map<String, Double> speciesLengthForYears = lengthForSpeciesYears.get(species); + if (speciesLengthForYears == null) { + speciesLengthForYears = new HashMap<String, Double>(); + lengthForSpeciesYears.put(species, speciesLengthForYears); + } + + String year = tuple[Length.INDEX_YEAR]; + setYear.add(year); + String nombreValue = tuple[Length.INDEX_NUMBER]; + try { + Double nombreDouble = Double.valueOf(nombreValue); + + if (speciesLengthForYears.containsKey(year)) { + Double oldValue = speciesLengthForYears.get(year); + Double newValue = oldValue + nombreDouble; + speciesLengthForYears.put(year, newValue); + } + else { + speciesLengthForYears.put(year, nombreDouble); + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse " + nombreValue + " as double"); + } + } + } + + // check for all species and years + for (Map.Entry<String, Map<String, Double>> catchEntries : catchForSpeciesYears.entrySet()) { + String species = catchEntries.getKey(); + Map<String, Double> catchNumbers = catchEntries.getValue(); + Map<String, Double> lengthNumbers = lengthForSpeciesYears.get(species); + + if (lengthNumbers == null) { + // on suppose que cette erreur est détectée par un autre controle + continue; + } + + Iterator<String> itYears = setYear.iterator(); + while (itYears.hasNext()) { + String year = itYears.next(); + + Double catchNumber = catchNumbers.get(year); + Double lengthNumber = lengthNumbers.get(year); + if (catchNumber == null) { + catchNumber = 0.0; // marche pou NA + } + if (lengthNumber == null) { + lengthNumber = 0.0; // marche pour NA + } + + // diff entre 4 et 5 = (5-4) * 100 / 5 + double diff = (Math.max(catchNumber, lengthNumber) - + Math.min(catchNumber, lengthNumber)) * 100 / Math.max(catchNumber, lengthNumber); + + if (diff > config.getControlDiffCatchLength()) { + ValidationError error = new ValidationError(); + error.setLevel(ValidationLevel.WARNING); + error.setMessage(_("coser.business.control.error.diffCatchLength")); + error.setMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year)); + validationErrors.add(error); + } + } + } + + return validationErrors; + } + + /** * Alerte si Somme(TAILLES$Nombre par TAILLES$Annee|Strate|Espece) < nobsmin * * @param control @@ -774,6 +900,13 @@ // Vérifier que les mêmes années sont présentes dans fichiers captures // traits et tailles: CAPTURES$Annee, TRAITS$Annee, TAILLES$Annee. if (!catchYear.equals(lengthYear) || !haulYear.equals(lengthYear)) { + + if (log.isDebugEnabled()) { + log.debug("Catch year = " + catchYear); + log.debug("Length year = " + lengthYear); + log.debug("Haul year = " + haulYear); + } + ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.FATAL); error.setMessage(_("coser.business.control.error.yearsNotEquals")); @@ -786,7 +919,7 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.FATAL); error.setMessage(_("coser.business.control.error.surveyNotEquals")); - error.setDetailMessage(_("coser.business.control.error.surveyNotEquals")); + //error.setDetailMessage(_("coser.business.control.error.surveyNotEquals")); crossFilesErrors.add(error); } @@ -797,7 +930,7 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.FATAL); error.setMessage(_("coser.business.control.error.incompleteHaulSpeciesData")); - error.setDetailMessage(_("coser.business.control.error.incompleteHaulSpeciesData")); + //error.setDetailMessage(_("coser.business.control.error.incompleteHaulSpeciesData")); crossFilesErrors.add(error); } @@ -808,7 +941,7 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.FATAL); error.setMessage(_("coser.business.control.error.incompleteHaulDataLength")); - error.setDetailMessage(_("coser.business.control.error.incompleteHaulDataLength")); + //error.setDetailMessage(_("coser.business.control.error.incompleteHaulDataLength")); crossFilesErrors.add(error); } @@ -819,7 +952,7 @@ ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.FATAL); error.setMessage(_("coser.business.control.error.incompleteHaulDataCatch")); - error.setDetailMessage(_("coser.business.control.error.incompleteHaulDataCatch")); + //error.setDetailMessage(_("coser.business.control.error.incompleteHaulDataCatch")); crossFilesErrors.add(error); } 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 2010-11-18 11:05:04 UTC (rev 230) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-18 11:06:46 UTC (rev 231) @@ -35,6 +35,7 @@ coser.business.common.number= coser.business.common.year= coser.business.control.error.diffCatchLength= +coser.business.control.error.diffCatchLengthDetail= coser.business.control.error.duplicatedLine= coser.business.control.error.incompleteHaulDataCatch= coser.business.control.error.incompleteHaulDataLength= 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 2010-11-18 11:05:04 UTC (rev 230) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-18 11:06:46 UTC (rev 231) @@ -34,7 +34,8 @@ coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombre dans Capture et Taille coser.business.common.number=Nombre coser.business.common.year=Ann\u00E9e -coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s) +coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille +coser.business.control.error.diffCatchLengthDetail=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s) coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.incompleteHaulDataCatch=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les captures coser.business.control.error.incompleteHaulDataLength=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les tailles

1 0

r230 - in trunk/coser-business/src/main: java/fr/ifremer/coser/validators resources
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 11:05:04 +0000 (Thu, 18 Nov 2010) New Revision: 230 Log: Modification du validateur regex (les valeurs vide ne doivent pas passer) Added: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java Modified: trunk/coser-business/src/main/resources/validators.xml Added: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-18 11:05:04 UTC (rev 230) @@ -0,0 +1,141 @@ +package fr.ifremer.coser.validators; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; + +/** + * Same validator, but empty string is not valid. + * + *  + * Validates a string field using a regular expression. + *  + * + * + * + *  + * <ul> + * <li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li> + * <li>expression - The RegExp expression REQUIRED</li> + * <li>caseSensitive - Boolean (Optional). Sets whether the expression should be matched against in a case-sensitive way. Default is <code>true</code>.</li> + * <li>trim - Boolean (Optional). Sets whether the expression should be trimed before matching. Default is <code>true</code>.</li> + * </ul> + *  + * + * + * <pre> + *  + * <validators> + *  + * <validator type="regex"> + * <param name="fieldName">myStrangePostcode</param> + * <param name="expression"><![CDATA[([aAbBcCdD][123][eEfFgG][456])]]<>/param> + * </validator> + * + *  + * <field name="myStrangePostcode"> + * <field-validator type="regex"> + * <param name="expression"><![CDATA[([aAbBcCdD][123][eEfFgG][456])]]></param> + * </field-validator> + * </field> + * </validators> + *  + * </pre> + * + * @author Quake Wang + * @version $Date$ $Revision$ + */ +public class RegexFieldValidator extends FieldValidatorSupport { + + private String expression; + private boolean caseSensitive = true; + private boolean trim = true; + + public void validate(Object object) throws ValidationException { + String fieldName = getFieldName(); + Object value = this.getFieldValue(fieldName, object); + // if there is no value - don't do comparison + // if a value is required, a required validator should be added to the field + if (value == null || expression == null) { + return; + } + + // XW-375 - must be a string + if (!(value instanceof String)) { + return; + } + + // string must not be empty + //String str = ((String) value).trim(); + //if (str.length() == 0) { + // return; + //} + + // match against expression + Pattern pattern; + if (isCaseSensitive()) { + pattern = Pattern.compile(expression); + } else { + pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE); + } + + String compare = (String) value; + if ( trim ) { + compare = compare.trim(); + } + Matcher matcher = pattern.matcher( compare ); + + if (!matcher.matches()) { + addFieldError(fieldName, object); + } + } + + /** + * @return Returns the regular expression to be matched. + */ + public String getExpression() { + return expression; + } + + /** + * Sets the regular expression to be matched. + */ + public void setExpression(String expression) { + this.expression = expression; + } + + /** + * @return Returns whether the expression should be matched against in + * a case-sensitive way. Default is <code>true</code>. + */ + public boolean isCaseSensitive() { + return caseSensitive; + } + + /** + * Sets whether the expression should be matched against in + * a case-sensitive way. Default is <code>true</code>. + */ + public void setCaseSensitive(boolean caseSensitive) { + this.caseSensitive = caseSensitive; + } + + /** + * @return Returns whether the expression should be trimed before matching. + * Default is <code>true</code>. + */ + public boolean isTrimed() { + return trim; + } + + /** + * Sets whether the expression should be trimed before matching. + * Default is <code>true</code>. + */ + public void setTrim(boolean trim) { + this.trim = trim; + } + +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/resources/validators.xml =================================================================== --- trunk/coser-business/src/main/resources/validators.xml 2010-11-18 10:52:05 UTC (rev 229) +++ trunk/coser-business/src/main/resources/validators.xml 2010-11-18 11:05:04 UTC (rev 230) @@ -42,11 +42,12 @@ <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/> <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> - <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/> +  <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/> <validator name="checkDouble" class="fr.ifremer.coser.validators.CoserCheckDoubleValidator"/> <validator name="coserDouble" class="fr.ifremer.coser.validators.CoserDoubleValidator"/> <validator name="coserExpression" class="fr.ifremer.coser.validators.CoserExpressionValidator"/> + <validator name="regex" class="fr.ifremer.coser.validators.RegexFieldValidator"/> </validators>

1 0

r229 - trunk/coser-business/src/main/java/fr/ifremer/coser/control
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 10:52:05 +0000 (Thu, 18 Nov 2010) New Revision: 229 Log: Fix null detail message (return message) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-18 10:46:02 UTC (rev 228) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-18 10:52:05 UTC (rev 229) @@ -137,7 +137,7 @@ if (result == null) { result = message; } - return detailMessage; + return result; } /**

1 0

r228 - trunk/coser-business/src/main/java/fr/ifremer/coser/control
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 10:46:02 +0000 (Thu, 18 Nov 2010) New Revision: 228 Log: Fix null detail message (return message) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-18 10:32:23 UTC (rev 227) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ValidationError.java 2010-11-18 10:46:02 UTC (rev 228) @@ -128,9 +128,15 @@ /** * Message donnant plus de précision sur l'erreur. * + * Si le message de detail est null, le message est retourné. + * * @return detail message */ public String getDetailMessage() { + String result = detailMessage; + if (result == null) { + result = message; + } return detailMessage; }

1 0

r227 - in trunk: coser-business/src/main/resources/i18n coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 10:32:23 +0000 (Thu, 18 Nov 2010) New Revision: 227 Log: Rename i18n files Added: 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 trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Removed: 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 trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties Deleted: trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-18 10:23:12 UTC (rev 226) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -1,67 +0,0 @@ -Age\ attribute\ is\ required= -Can't\ create\ project= -Can't\ find\ line\ %s\ for\ deletion= -Can't\ find\ line\ %s\ for\ undeletion= -Can't\ read\ file\ %s\ for\ category\ %s= -Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator= -Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Depth\ attribute\ is\ not\ a\ valid\ double= -Maturity\ attribute\ is\ required= -Missing\ file\ %s= -Number\ attribute\ is\ not\ a\ valid\ double= -Project\ %s\ already\ exist= -Project\ %s\ doesn't\ exists\ \!= -Selection\ %s\ already\ exists= -Sex\ is\ mandatory= -Specy\ %s\ doesn't\ exist\ in\ referential= -Weight\ attribute\ is\ not\ a\ valid\ double= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= -You\ must\ enter\ a\ campagne\ name.= -You\ must\ enter\ a\ espece\ name.= -You\ must\ enter\ a\ haul\ name.= -You\ must\ enter\ a\ month\ name.= -You\ must\ enter\ a\ strata\ name.= -You\ must\ enter\ a\ stratum\ name.= -You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ trait\ name.= -coser.business.category.catch=Catch -coser.business.category.haul=Haul -coser.business.category.length=Length -coser.business.category.reftax.species= -coser.business.category.strata=Stata -coser.business.category.typeEspece=Specy type code -coser.business.chart.compareCatchLengthNumberTitle= -coser.business.common.number= -coser.business.common.year= -coser.business.control.error.duplicatedLine= -coser.business.control.error.incompleteHaulDataCatch= -coser.business.control.error.incompleteHaulDataLength= -coser.business.control.error.incompleteHaulSpeciesData= -coser.business.control.error.minObservationCount= -coser.business.control.error.minObservationCountDetail= -coser.business.control.error.nonExistantSpecies= -coser.business.control.error.nonExistantSpeciesDetail= -coser.business.control.error.surveyNotEquals= -coser.business.control.error.yearsNotEquals= -coser.business.control.noerrorfound=No error found -coser.business.control.step.crossFileChech= -coser.business.control.step.observation= -coser.business.control.step.xworks= -coser.business.line=Line -coser.business.selection.noControlForSelection= -coser.config.control.diffcatchlength.description= -coser.config.database.directory.description= -coser.config.observation.nobsmin.description= -coser.config.projects.directory.description= -coser.config.reference.species.description= -coser.config.reference.typeEspeces.description= -coser.config.validator.directory.description= -lat\ attribute\ is\ not\ a\ valid\ double= -lat\ must\ contains\ at\ least\ 3\ decimal= -length\ attribute\ is\ not\ a\ valid\ double= -long\ attribute\ is\ not\ a\ valid\ double= -long\ must\ contains\ at\ least\ 3\ decimal= -number\ attribute\ is\ not\ a\ valid\ double= -sweptSurface\ attribute\ is\ not\ a\ valid\ double= -year\ is\ not\ valid= Deleted: trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-18 10:23:12 UTC (rev 226) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -1,67 +0,0 @@ -Age\ attribute\ is\ required= -Can't\ create\ project=Impossible de cr\u00E9er le projet -Can't\ find\ line\ %s\ for\ deletion= -Can't\ find\ line\ %s\ for\ undeletion= -Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \! -Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';' -Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Depth\ attribute\ is\ not\ a\ valid\ double= -Maturity\ attribute\ is\ required= -Missing\ file\ %s=Fichier manquant \: %s -Number\ attribute\ is\ not\ a\ valid\ double= -Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! -Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! -Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! -Sex\ is\ mandatory= -Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel -Weight\ attribute\ is\ not\ a\ valid\ double= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s.\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.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. -You\ must\ enter\ a\ campagne\ name.= -You\ must\ enter\ a\ espece\ name.= -You\ must\ enter\ a\ haul\ name.= -You\ must\ enter\ a\ month\ name.= -You\ must\ enter\ a\ strata\ name.= -You\ must\ enter\ a\ stratum\ name.= -You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ trait\ name.= -coser.business.category.catch=Captures -coser.business.category.haul=Traits -coser.business.category.length=Tailles -coser.business.category.reftax.species=Reftax (esp\u00E8ce) -coser.business.category.strata=Strates -coser.business.category.typeEspece=Code type des esp\u00E8ces -coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombre dans Capture et Taille -coser.business.common.number=Nombre -coser.business.common.year=Ann\u00E9e -coser.business.control.error.duplicatedLine=Ligne en doublon -coser.business.control.error.incompleteHaulDataCatch=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les captures -coser.business.control.error.incompleteHaulDataLength=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les tailles -coser.business.control.error.incompleteHaulSpeciesData=Certains couples Annee|Trait|Espece ne sont pas pr\u00E9sents dans les captures -coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint -coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f -coser.business.control.error.nonExistantSpecies=Esp\u00E8ces non existantes dans le reftax -coser.business.control.error.nonExistantSpeciesDetail=Esp\u00E8ce %s non existante dans le reftax -coser.business.control.error.surveyNotEquals=Les noms de campagnes de sont pas \u00E9gaux -coser.business.control.error.yearsNotEquals=Les ann\u00E9es ne sont pas identiques -coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e -coser.business.control.step.crossFileChech=V\u00E9rification par croisement de fichiers (%d%%) -coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) -coser.business.control.step.xworks=Validation par lignes (%d%%) -coser.business.line=Ligne -coser.business.selection.noControlForSelection=Impossible de creer une s\u00E9lection sans donn\u00E9es control\u00E9es. -coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles -coser.config.database.directory.description=Emplacement de la base de campagnes de coser -coser.config.observation.nobsmin.description=Nombre minimal d'observation -coser.config.projects.directory.description=Emplacement des projets Coser -coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces -coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces -coser.config.validator.directory.description=Emplacement des fichiers de validations -lat\ attribute\ is\ not\ a\ valid\ double= -lat\ must\ contains\ at\ least\ 3\ decimal= -length\ attribute\ is\ not\ a\ valid\ double= -long\ attribute\ is\ not\ a\ valid\ double= -long\ must\ contains\ at\ least\ 3\ decimal= -number\ attribute\ is\ not\ a\ valid\ double= -sweptSurface\ attribute\ is\ not\ a\ valid\ double= -year\ is\ not\ valid= Copied: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties (from rev 223, trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties) =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties (rev 0) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -0,0 +1,69 @@ +Age\ attribute\ is\ required= +Can't\ create\ project= +Can't\ find\ line\ %s\ for\ deletion= +Can't\ find\ line\ %s\ for\ undeletion= +Can't\ read\ file\ %s\ for\ category\ %s= +Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator= +Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= +Depth\ attribute\ is\ not\ a\ valid\ double= +Maturity\ attribute\ is\ required= +Missing\ file\ %s= +Number\ attribute\ is\ not\ a\ valid\ double= +Project\ %s\ already\ exist= +Project\ %s\ doesn't\ exists\ \!= +Selection\ %s\ already\ exists= +Sex\ is\ mandatory= +Specy\ %s\ doesn't\ exist\ in\ referential= +Weight\ attribute\ is\ not\ a\ valid\ double= +Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= +Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= +You\ must\ enter\ a\ campagne\ name.= +You\ must\ enter\ a\ espece\ name.= +You\ must\ enter\ a\ haul\ name.= +You\ must\ enter\ a\ month\ name.= +You\ must\ enter\ a\ strata\ name.= +You\ must\ enter\ a\ stratum\ name.= +You\ must\ enter\ a\ survey\ name.= +You\ must\ enter\ a\ trait\ name.= +coser.business.category.catch=Catch +coser.business.category.haul=Haul +coser.business.category.length=Length +coser.business.category.reftax.species= +coser.business.category.strata=Stata +coser.business.category.typeEspece=Specy type code +coser.business.chart.compareCatchLengthNumberTitle= +coser.business.common.number= +coser.business.common.year= +coser.business.control.error.diffCatchLength= +coser.business.control.error.duplicatedLine= +coser.business.control.error.incompleteHaulDataCatch= +coser.business.control.error.incompleteHaulDataLength= +coser.business.control.error.incompleteHaulSpeciesData= +coser.business.control.error.minObservationCount= +coser.business.control.error.minObservationCountDetail= +coser.business.control.error.noCatchNumberWithWeight= +coser.business.control.error.nonExistantSpecies= +coser.business.control.error.nonExistantSpeciesDetail= +coser.business.control.error.surveyNotEquals= +coser.business.control.error.yearsNotEquals= +coser.business.control.noerrorfound=No error found +coser.business.control.step.crossFileChech= +coser.business.control.step.observation= +coser.business.control.step.xworks= +coser.business.line=Line +coser.business.selection.noControlForSelection= +coser.config.control.diffcatchlength.description= +coser.config.database.directory.description= +coser.config.observation.nobsmin.description= +coser.config.projects.directory.description= +coser.config.reference.species.description= +coser.config.reference.typeEspeces.description= +coser.config.validator.directory.description= +lat\ attribute\ is\ not\ a\ valid\ double= +lat\ must\ contains\ at\ least\ 3\ decimal= +length\ attribute\ is\ not\ a\ valid\ double= +long\ attribute\ is\ not\ a\ valid\ double= +long\ must\ contains\ at\ least\ 3\ decimal= +number\ attribute\ is\ not\ a\ valid\ double= +sweptSurface\ attribute\ is\ not\ a\ valid\ double= +year\ is\ not\ valid= Copied: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties (from rev 223, trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties) =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties (rev 0) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -0,0 +1,69 @@ +Age\ attribute\ is\ required= +Can't\ create\ project=Impossible de cr\u00E9er le projet +Can't\ find\ line\ %s\ for\ deletion= +Can't\ find\ line\ %s\ for\ undeletion= +Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \! +Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';' +Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= +Depth\ attribute\ is\ not\ a\ valid\ double= +Maturity\ attribute\ is\ required= +Missing\ file\ %s=Fichier manquant \: %s +Number\ attribute\ is\ not\ a\ valid\ double= +Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! +Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! +Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! +Sex\ is\ mandatory= +Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel +Weight\ attribute\ is\ not\ a\ valid\ double= +Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s.\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.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. +You\ must\ enter\ a\ campagne\ name.= +You\ must\ enter\ a\ espece\ name.= +You\ must\ enter\ a\ haul\ name.= +You\ must\ enter\ a\ month\ name.= +You\ must\ enter\ a\ strata\ name.= +You\ must\ enter\ a\ stratum\ name.= +You\ must\ enter\ a\ survey\ name.= +You\ must\ enter\ a\ trait\ name.= +coser.business.category.catch=Captures +coser.business.category.haul=Traits +coser.business.category.length=Tailles +coser.business.category.reftax.species=Reftax (esp\u00E8ce) +coser.business.category.strata=Strates +coser.business.category.typeEspece=Code type des esp\u00E8ces +coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombre dans Capture et Taille +coser.business.common.number=Nombre +coser.business.common.year=Ann\u00E9e +coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s) +coser.business.control.error.duplicatedLine=Ligne en doublon +coser.business.control.error.incompleteHaulDataCatch=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les captures +coser.business.control.error.incompleteHaulDataLength=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les tailles +coser.business.control.error.incompleteHaulSpeciesData=Certains couples Annee|Trait|Espece ne sont pas pr\u00E9sents dans les captures +coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint +coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f +coser.business.control.error.noCatchNumberWithWeight=Poids sp\u00E9cifi\u00E9, mais nombre non d\u00E9finit +coser.business.control.error.nonExistantSpecies=Esp\u00E8ces non existantes dans le reftax +coser.business.control.error.nonExistantSpeciesDetail=Esp\u00E8ce %s non existante dans le reftax +coser.business.control.error.surveyNotEquals=Les noms de campagnes de sont pas \u00E9gaux +coser.business.control.error.yearsNotEquals=Les ann\u00E9es ne sont pas identiques +coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e +coser.business.control.step.crossFileChech=V\u00E9rification par croisement de fichiers (%d%%) +coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) +coser.business.control.step.xworks=Validation par lignes (%d%%) +coser.business.line=Ligne +coser.business.selection.noControlForSelection=Impossible de creer une s\u00E9lection sans donn\u00E9es control\u00E9es. +coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles +coser.config.database.directory.description=Emplacement de la base de campagnes de coser +coser.config.observation.nobsmin.description=Nombre minimal d'observation +coser.config.projects.directory.description=Emplacement des projets Coser +coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces +coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces +coser.config.validator.directory.description=Emplacement des fichiers de validations +lat\ attribute\ is\ not\ a\ valid\ double= +lat\ must\ contains\ at\ least\ 3\ decimal= +length\ attribute\ is\ not\ a\ valid\ double= +long\ attribute\ is\ not\ a\ valid\ double= +long\ must\ contains\ at\ least\ 3\ decimal= +number\ attribute\ is\ not\ a\ valid\ double= +sweptSurface\ attribute\ is\ not\ a\ valid\ double= +year\ is\ not\ valid= Deleted: trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-18 10:23:12 UTC (rev 226) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -1,141 +0,0 @@ -coser.config.application.version.description=Application's version -coser.config.category.control=Control -coser.config.category.control.description=Control -coser.config.category.main=Coser -coser.config.category.main.description=Main configuration -coser.config.config.file.description=Coser configuration file -coser.config.locale.description=Application's locale -coser.config.lookandfeel.description=Application's swing theme -coser.config.support.email.description=Support email address -coser.ui.common.cancel=Cancel -coser.ui.common.comment=Comment -coser.ui.common.selectAll=All -coser.ui.common.selectAll.short= -coser.ui.common.selectFile=Select\u2026 -coser.ui.common.unselectAll=None -coser.ui.common.unselectAll.short= -coser.ui.common.valid=Valid -coser.ui.config.title=Configuration -coser.ui.control.categorylabel= -coser.ui.control.comment= -coser.ui.control.confirmDeletionMessage=Are you sure you want to delete this data ? -coser.ui.control.confirmDeletionTitle=Confirm delete -coser.ui.control.confirmDeletionsMessage=Are you sure you want to delete %d selected lines ? -coser.ui.control.dataMenuDeleteSelected=Deleted selected lines -coser.ui.control.dataMenuLabel=Data menu -coser.ui.control.dataMenuReplace=Replace in %s for selection -coser.ui.control.dataMenuReplaceAll=Replace in %s in all data -coser.ui.control.deleteLine=Delete line -coser.ui.control.error.allCategories= -coser.ui.control.global.done=\u2026 -coser.ui.control.global.message=Message -coser.ui.control.globalErrorMenuLabel=Error menu -coser.ui.control.globalErrorMenuSelectAll=Select all lines -coser.ui.control.graph.specy=Specy \: -coser.ui.control.graphtitle=Graph -coser.ui.control.project.requiredauthor= -coser.ui.control.project.requiredcatchFile= -coser.ui.control.project.requiredhaulFile= -coser.ui.control.project.requiredlengthFile= -coser.ui.control.project.requiredname= -coser.ui.control.project.requiredstrataFile= -coser.ui.control.replace.find=Find \: -coser.ui.control.replace.inField=In field \: -coser.ui.control.replace.replace=Replace \: -coser.ui.control.replace.title=Find and replace -coser.ui.control.save=Save -coser.ui.control.validcontrol= -coser.ui.control.validcontroltip= -coser.ui.error.htmlmessage=An error occurs \: %s -coser.ui.error.title=Global application error -coser.ui.graph.compareNumberCatchSize= -coser.ui.graph.lengthStructure= -coser.ui.mainframe.menu.configuration=Configuration -coser.ui.mainframe.menu.data=Data -coser.ui.mainframe.menu.data.control=Control -coser.ui.mainframe.menu.data.newSelection=New selection -coser.ui.mainframe.menu.data.noSelection=No selection -coser.ui.mainframe.menu.data.noValidation= -coser.ui.mainframe.menu.data.selection=S\u00E9lection -coser.ui.mainframe.menu.file=File -coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais -coser.ui.mainframe.menu.locale.uk=English -coser.ui.mainframe.menu.newProject=New project -coser.ui.mainframe.menu.openProject=Open project -coser.ui.mainframe.menu.options=Options -coser.ui.mainframe.menu.quit=Quit -coser.ui.mainframe.menu.validators=Validators -coser.ui.mainframe.menu.view=View -coser.ui.mainframe.menu.view.lookandfeel=Theme -coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi -coser.ui.project.captureFile=Capture file \: -coser.ui.project.createProject=Create project -coser.ui.project.creationError=Creation error -coser.ui.project.customReferenceSpeciesFile=New reference file \: -coser.ui.project.lengthFile=Length file \: -coser.ui.project.newProject=New project -coser.ui.project.openError=Open error -coser.ui.project.openProject=Open -coser.ui.project.openProjectTitle=Open existing project -coser.ui.project.project=Project \: -coser.ui.project.projectauthor= -coser.ui.project.projectcomment=Comments \: -coser.ui.project.projectname=Project name \: -coser.ui.project.stratesFile=Strates file \: -coser.ui.project.traitsFile=Traits file \: -coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file -coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: -coser.ui.result.addNewResult=Save result -coser.ui.result.addOtherDataFile=Add file -coser.ui.result.availableDataTitle=Available results \: -coser.ui.result.dataFile1=Data file 1 \: -coser.ui.result.dataFile2=Data file 2 \: -coser.ui.result.extractDataButton=Extract -coser.ui.result.extractDataLabel=Extraction directory -coser.ui.result.extractDataTitle=Extract RSufi data -coser.ui.result.newDataTitle=New result -coser.ui.result.otherDataFile=Other files \: -coser.ui.result.resultName=Result name \: -coser.ui.result.rsufiVersion=RSufi version -coser.ui.selection.allSpecies=L1 \: All species -coser.ui.selection.createError=Creation error -coser.ui.selection.details.beginDate=Begin date \: -coser.ui.selection.details.comment=Comments -coser.ui.selection.details.description=Description \: -coser.ui.selection.details.endDate=End date \: -coser.ui.selection.details.name=Selection name \: -coser.ui.selection.details.saveSelection=Save selection -coser.ui.selection.details.showMapTip= -coser.ui.selection.details.showSpreciesTip= -coser.ui.selection.details.species=Species \: -coser.ui.selection.details.strata=Strata \: -coser.ui.selection.details.type= -coser.ui.selection.filter.density=Density \: -coser.ui.selection.filter.filter=Filter -coser.ui.selection.filter.occurrence=Occurrence \: -coser.ui.selection.fusion.comment=Comment -coser.ui.selection.fusion.description=Species merge. Fill new specy name with name existing in referential. -coser.ui.selection.fusion.name=New name \: -coser.ui.selection.fusion.title=Merge -coser.ui.selection.fusionError=Merge error -coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! -coser.ui.selection.maturitySpecies=L4 \: Species with maturity -coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species -coser.ui.selection.occurrencedensityrenderer=<html>%s(Occ\=%.2f, Dens\=%.2f)</html> -coser.ui.selection.saveError=Save error -coser.ui.selection.selection.requiredName= -coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year -coser.ui.selection.speciesMenuFusion=Merge -coser.ui.selection.speciesMenuLabel=Species menu -coser.ui.selection.tab.details=Selection details -coser.ui.selection.tab.lists=Species lists -coser.ui.selection.tab.rsufi=RSufi -coser.ui.validation.checkData=Check data -coser.ui.validators.cancel=Cancel -coser.ui.validators.deleteValidator=Supprimer -coser.ui.validators.description=Application must be restarted after validators modification. -coser.ui.validators.entity=Entity -coser.ui.validators.newValidator=New Validator -coser.ui.validators.title=Validators -coser.ui.validators.valid=Valid -coser.ui.validators.validators=Validators \: Deleted: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-18 10:23:12 UTC (rev 226) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -1,141 +0,0 @@ -coser.config.application.version.description=Version de l'application -coser.config.category.control=Contr\u00F4le -coser.config.category.control.description=Contr\u00F4le -coser.config.category.main=Coser -coser.config.category.main.description=Configuration principale -coser.config.config.file.description=Fichier de configuration de Coser -coser.config.locale.description=Langue de l'application -coser.config.lookandfeel.description=Themes graphique Swing de l'application -coser.config.support.email.description=Adresse de suport pour l'envoi des erreurs -coser.ui.common.cancel=Annuler -coser.ui.common.comment=Commentaire -coser.ui.common.selectAll=S\u00E9lectionner tout -coser.ui.common.selectAll.short=Tout -coser.ui.common.selectFile=S\u00E9lectionner\u2026 -coser.ui.common.unselectAll=D\u00E9-s\u00E9lectionner tout -coser.ui.common.unselectAll.short=Aucun -coser.ui.common.valid=Valider -coser.ui.config.title=Configuration -coser.ui.control.categorylabel=Donn\u00E9es affich\u00E9es \: -coser.ui.control.comment=Commentaire \: -coser.ui.control.confirmDeletionMessage=\u00CAtes vous s\u00FBr de vouloir supprimer cette donn\u00E9e ? -coser.ui.control.confirmDeletionTitle=Confirmation de suppression -coser.ui.control.confirmDeletionsMessage=\u00CAtes vous s\u00FBr de vouloir supprimer les %d lignes s\u00E9lectionn\u00E9es ? -coser.ui.control.dataMenuDeleteSelected=Supprimer les lignes s\u00E9lectionn\u00E9es -coser.ui.control.dataMenuLabel=Menu des donn\u00E9es -coser.ui.control.dataMenuReplace=Remplacer dans %s pour la s\u00E9lection -coser.ui.control.dataMenuReplaceAll=Remplacer dans %s pour toutes les lignes -coser.ui.control.deleteLine=Supprimer la ligne -coser.ui.control.error.allCategories=Toutes les cat\u00E9gories -coser.ui.control.global.done=\u2026 -coser.ui.control.global.message=Message -coser.ui.control.globalErrorMenuLabel=Menu des erreurs -coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes -coser.ui.control.graph.specy=Esp\u00E8ces \: -coser.ui.control.graphtitle=Graphique -coser.ui.control.project.requiredauthor=Le champs 'auteur' est requis -coser.ui.control.project.requiredcatchFile=Le fichier 'capture' est requis -coser.ui.control.project.requiredhaulFile=Le fichier 'traits' est requis -coser.ui.control.project.requiredlengthFile=Le fichier 'taille' est requis -coser.ui.control.project.requiredname=Le champs 'nom' est requis -coser.ui.control.project.requiredstrataFile=Le fichier 'strates' est requis -coser.ui.control.replace.find=Chercher \: -coser.ui.control.replace.inField=Dans le champ \: -coser.ui.control.replace.replace=Remplacer \: -coser.ui.control.replace.title=Chercher et remplacer -coser.ui.control.save=Sauvegarder -coser.ui.control.validcontrol=Valider le contr\u00F4le -coser.ui.control.validcontroltip=Marque le contr\u00F4le comme valid\u00E9. Ne peut \u00EAtre effectu\u00E9 qu'apr\u00E8s une v\u00E9rification des donn\u00E9es termin\u00E9e sans erreurs. -coser.ui.error.htmlmessage=Une erreur s'est produite \: %s -coser.ui.error.title=Erreur globale -coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles -coser.ui.graph.lengthStructure=Structures en taille -coser.ui.mainframe.menu.configuration=Configuration -coser.ui.mainframe.menu.data=Donn\u00E9es -coser.ui.mainframe.menu.data.control=Contr\u00F4le -coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection -coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection -coser.ui.mainframe.menu.data.noValidation=Contr\u00F4le non valid\u00E9 -coser.ui.mainframe.menu.data.selection=S\u00E9lections -coser.ui.mainframe.menu.file=Fichier -coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais -coser.ui.mainframe.menu.locale.uk=English -coser.ui.mainframe.menu.newProject=Nouveau projet -coser.ui.mainframe.menu.openProject=Ouvrir un projet -coser.ui.mainframe.menu.options=Options -coser.ui.mainframe.menu.quit=Quitter -coser.ui.mainframe.menu.validators=Validateurs -coser.ui.mainframe.menu.view=Vue -coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me -coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi -coser.ui.project.captureFile=Fichier de captures \: -coser.ui.project.createProject=Cr\u00E9er le projet -coser.ui.project.creationError=Erreur de cr\u00E9ation -coser.ui.project.customReferenceSpeciesFile=Nouveau fichier de r\u00E9f\u00E9rence \: -coser.ui.project.lengthFile=Fichiers des tailles \: -coser.ui.project.newProject=Nouveau projet -coser.ui.project.openError=Erreur d'ouverture -coser.ui.project.openProject=Ouvrir -coser.ui.project.openProjectTitle=Ouvrir un projet existant -coser.ui.project.project=Projet \: -coser.ui.project.projectauthor=Auteur \: -coser.ui.project.projectcomment=Commentaire \: -coser.ui.project.projectname=Nom du projet \: -coser.ui.project.stratesFile=Fichiers des strates \: -coser.ui.project.traitsFile=Fichiers des traits \: -coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence -coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 (Reftax) \: -coser.ui.result.addNewResult=Enregistrer le r\u00E9sultat -coser.ui.result.addOtherDataFile=Ajouter un fichier -coser.ui.result.availableDataTitle=R\u00E9sultats disponibles \: -coser.ui.result.dataFile1=Fichier r\u00E9sultat 1 \: -coser.ui.result.dataFile2=Fichier r\u00E9sultat 2 \: -coser.ui.result.extractDataButton=Extraire -coser.ui.result.extractDataLabel=Dossier d'extraction \: -coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi -coser.ui.result.newDataTitle=Nouveau r\u00E9sultat -coser.ui.result.otherDataFile=Autre fichiers \: -coser.ui.result.resultName=Nom du r\u00E9sultat \: -coser.ui.result.rsufiVersion=Version de RSufi \: -coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces -coser.ui.selection.createError=Erreur de cr\u00E9action -coser.ui.selection.details.beginDate=Date de d\u00E9but \: -coser.ui.selection.details.comment=Commentaire -coser.ui.selection.details.description=Description \: -coser.ui.selection.details.endDate=Date de fin \: -coser.ui.selection.details.name=Nom de la s\u00E9lection \: -coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection -coser.ui.selection.details.showMapTip=Afficher la carte des zones -coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces -coser.ui.selection.details.species=Esp\u00E8ces \: -coser.ui.selection.details.strata=Strates \: -coser.ui.selection.details.type=Filtrer par type \: -coser.ui.selection.filter.density=Densit\u00E9 \: -coser.ui.selection.filter.filter=Filtrer -coser.ui.selection.filter.occurrence=Occurence \: -coser.ui.selection.fusion.comment=Commentaire \: -coser.ui.selection.fusion.description=Fusion d'esp\u00E8ces. Veuillez renseigner un nouveau nom pr\u00E9sent dans le r\u00E9f\u00E9rentiel. -coser.ui.selection.fusion.name=Nouveau nom \: -coser.ui.selection.fusion.title=Fusion -coser.ui.selection.fusionError=Erreur de fusion -coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! -coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 -coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es -coser.ui.selection.occurrencedensityrenderer=<html>%s(Occ\=%.2f, Dens\=%.2f)</html> -coser.ui.selection.saveError=Erreur de sauvegarde -coser.ui.selection.selection.requiredName=Le champ 'nom' est requis -coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es -coser.ui.selection.speciesMenuFusion=Fusion -coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces -coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection -coser.ui.selection.tab.lists=Listes des esp\u00E8ces -coser.ui.selection.tab.rsufi=RSufi -coser.ui.validation.checkData=V\u00E9rifier les donn\u00E9es -coser.ui.validators.cancel=Annuler -coser.ui.validators.deleteValidator=Supprimer -coser.ui.validators.description=L'application doit \u00EAtre red\u00E9marr\u00E9e apr\u00E8s la modification des validateurs. -coser.ui.validators.entity=Entit\u00E9 -coser.ui.validators.newValidator=Nouveau validateur -coser.ui.validators.title=Validateurs -coser.ui.validators.valid=Valider -coser.ui.validators.validators=Validateurs \: Copied: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties (from rev 223, trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties) =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties (rev 0) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -0,0 +1,141 @@ +coser.config.application.version.description=Application's version +coser.config.category.control=Control +coser.config.category.control.description=Control +coser.config.category.main=Coser +coser.config.category.main.description=Main configuration +coser.config.config.file.description=Coser configuration file +coser.config.locale.description=Application's locale +coser.config.lookandfeel.description=Application's swing theme +coser.config.support.email.description=Support email address +coser.ui.common.cancel=Cancel +coser.ui.common.comment=Comment +coser.ui.common.selectAll=All +coser.ui.common.selectAll.short= +coser.ui.common.selectFile=Select\u2026 +coser.ui.common.unselectAll=None +coser.ui.common.unselectAll.short= +coser.ui.common.valid=Valid +coser.ui.config.title=Configuration +coser.ui.control.categorylabel= +coser.ui.control.comment= +coser.ui.control.confirmDeletionMessage=Are you sure you want to delete this data ? +coser.ui.control.confirmDeletionTitle=Confirm delete +coser.ui.control.confirmDeletionsMessage=Are you sure you want to delete %d selected lines ? +coser.ui.control.dataMenuDeleteSelected=Deleted selected lines +coser.ui.control.dataMenuLabel=Data menu +coser.ui.control.dataMenuReplace=Replace in %s for selection +coser.ui.control.dataMenuReplaceAll=Replace in %s in all data +coser.ui.control.deleteLine=Delete line +coser.ui.control.error.allCategories= +coser.ui.control.global.done=\u2026 +coser.ui.control.global.message=Message +coser.ui.control.globalErrorMenuLabel=Error menu +coser.ui.control.globalErrorMenuSelectAll=Select all lines +coser.ui.control.graph.specy=Specy \: +coser.ui.control.graphtitle=Graph +coser.ui.control.project.requiredauthor= +coser.ui.control.project.requiredcatchFile= +coser.ui.control.project.requiredhaulFile= +coser.ui.control.project.requiredlengthFile= +coser.ui.control.project.requiredname= +coser.ui.control.project.requiredstrataFile= +coser.ui.control.replace.find=Find \: +coser.ui.control.replace.inField=In field \: +coser.ui.control.replace.replace=Replace \: +coser.ui.control.replace.title=Find and replace +coser.ui.control.save=Save +coser.ui.control.validcontrol= +coser.ui.control.validcontroltip= +coser.ui.error.htmlmessage=An error occurs \: %s +coser.ui.error.title=Global application error +coser.ui.graph.compareNumberCatchSize= +coser.ui.graph.lengthStructure= +coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Data +coser.ui.mainframe.menu.data.control=Control +coser.ui.mainframe.menu.data.newSelection=New selection +coser.ui.mainframe.menu.data.noSelection=No selection +coser.ui.mainframe.menu.data.noValidation= +coser.ui.mainframe.menu.data.selection=S\u00E9lection +coser.ui.mainframe.menu.file=File +coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais +coser.ui.mainframe.menu.locale.uk=English +coser.ui.mainframe.menu.newProject=New project +coser.ui.mainframe.menu.openProject=Open project +coser.ui.mainframe.menu.options=Options +coser.ui.mainframe.menu.quit=Quit +coser.ui.mainframe.menu.validators=Validators +coser.ui.mainframe.menu.view=View +coser.ui.mainframe.menu.view.lookandfeel=Theme +coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.project.captureFile=Capture file \: +coser.ui.project.createProject=Create project +coser.ui.project.creationError=Creation error +coser.ui.project.customReferenceSpeciesFile=New reference file \: +coser.ui.project.lengthFile=Length file \: +coser.ui.project.newProject=New project +coser.ui.project.openError=Open error +coser.ui.project.openProject=Open +coser.ui.project.openProjectTitle=Open existing project +coser.ui.project.project=Project \: +coser.ui.project.projectauthor= +coser.ui.project.projectcomment=Comments \: +coser.ui.project.projectname=Project name \: +coser.ui.project.stratesFile=Strates file \: +coser.ui.project.traitsFile=Traits file \: +coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file +coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: +coser.ui.result.addNewResult=Save result +coser.ui.result.addOtherDataFile=Add file +coser.ui.result.availableDataTitle=Available results \: +coser.ui.result.dataFile1=Data file 1 \: +coser.ui.result.dataFile2=Data file 2 \: +coser.ui.result.extractDataButton=Extract +coser.ui.result.extractDataLabel=Extraction directory +coser.ui.result.extractDataTitle=Extract RSufi data +coser.ui.result.newDataTitle=New result +coser.ui.result.otherDataFile=Other files \: +coser.ui.result.resultName=Result name \: +coser.ui.result.rsufiVersion=RSufi version +coser.ui.selection.allSpecies=L1 \: All species +coser.ui.selection.createError=Creation error +coser.ui.selection.details.beginDate=Begin date \: +coser.ui.selection.details.comment=Comments +coser.ui.selection.details.description=Description \: +coser.ui.selection.details.endDate=End date \: +coser.ui.selection.details.name=Selection name \: +coser.ui.selection.details.saveSelection=Save selection +coser.ui.selection.details.showMapTip= +coser.ui.selection.details.showSpreciesTip= +coser.ui.selection.details.species=Species \: +coser.ui.selection.details.strata=Strata \: +coser.ui.selection.details.type= +coser.ui.selection.filter.density=Density \: +coser.ui.selection.filter.filter=Filter +coser.ui.selection.filter.occurrence=Occurrence \: +coser.ui.selection.fusion.comment=Comment +coser.ui.selection.fusion.description=Species merge. Fill new specy name with name existing in referential. +coser.ui.selection.fusion.name=New name \: +coser.ui.selection.fusion.title=Merge +coser.ui.selection.fusionError=Merge error +coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! +coser.ui.selection.maturitySpecies=L4 \: Species with maturity +coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species +coser.ui.selection.occurrencedensityrenderer=<html>%s(Occ\=%.2f, Dens\=%.2f)</html> +coser.ui.selection.saveError=Save error +coser.ui.selection.selection.requiredName= +coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year +coser.ui.selection.speciesMenuFusion=Merge +coser.ui.selection.speciesMenuLabel=Species menu +coser.ui.selection.tab.details=Selection details +coser.ui.selection.tab.lists=Species lists +coser.ui.selection.tab.rsufi=RSufi +coser.ui.validation.checkData=Check data +coser.ui.validators.cancel=Cancel +coser.ui.validators.deleteValidator=Supprimer +coser.ui.validators.description=Application must be restarted after validators modification. +coser.ui.validators.entity=Entity +coser.ui.validators.newValidator=New Validator +coser.ui.validators.title=Validators +coser.ui.validators.valid=Valid +coser.ui.validators.validators=Validators \: Copied: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties (from rev 223, trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties) =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties (rev 0) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-18 10:32:23 UTC (rev 227) @@ -0,0 +1,141 @@ +coser.config.application.version.description=Version de l'application +coser.config.category.control=Contr\u00F4le +coser.config.category.control.description=Contr\u00F4le +coser.config.category.main=Coser +coser.config.category.main.description=Configuration principale +coser.config.config.file.description=Fichier de configuration de Coser +coser.config.locale.description=Langue de l'application +coser.config.lookandfeel.description=Themes graphique Swing de l'application +coser.config.support.email.description=Adresse de suport pour l'envoi des erreurs +coser.ui.common.cancel=Annuler +coser.ui.common.comment=Commentaire +coser.ui.common.selectAll=S\u00E9lectionner tout +coser.ui.common.selectAll.short=Tout +coser.ui.common.selectFile=S\u00E9lectionner\u2026 +coser.ui.common.unselectAll=D\u00E9-s\u00E9lectionner tout +coser.ui.common.unselectAll.short=Aucun +coser.ui.common.valid=Valider +coser.ui.config.title=Configuration +coser.ui.control.categorylabel=Donn\u00E9es affich\u00E9es \: +coser.ui.control.comment=Commentaire \: +coser.ui.control.confirmDeletionMessage=\u00CAtes vous s\u00FBr de vouloir supprimer cette donn\u00E9e ? +coser.ui.control.confirmDeletionTitle=Confirmation de suppression +coser.ui.control.confirmDeletionsMessage=\u00CAtes vous s\u00FBr de vouloir supprimer les %d lignes s\u00E9lectionn\u00E9es ? +coser.ui.control.dataMenuDeleteSelected=Supprimer les lignes s\u00E9lectionn\u00E9es +coser.ui.control.dataMenuLabel=Menu des donn\u00E9es +coser.ui.control.dataMenuReplace=Remplacer dans %s pour la s\u00E9lection +coser.ui.control.dataMenuReplaceAll=Remplacer dans %s pour toutes les lignes +coser.ui.control.deleteLine=Supprimer la ligne +coser.ui.control.error.allCategories=Toutes les cat\u00E9gories +coser.ui.control.global.done=\u2026 +coser.ui.control.global.message=Message +coser.ui.control.globalErrorMenuLabel=Menu des erreurs +coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes +coser.ui.control.graph.specy=Esp\u00E8ces \: +coser.ui.control.graphtitle=Graphique +coser.ui.control.project.requiredauthor=Le champs 'auteur' est requis +coser.ui.control.project.requiredcatchFile=Le fichier 'capture' est requis +coser.ui.control.project.requiredhaulFile=Le fichier 'traits' est requis +coser.ui.control.project.requiredlengthFile=Le fichier 'taille' est requis +coser.ui.control.project.requiredname=Le champs 'nom' est requis +coser.ui.control.project.requiredstrataFile=Le fichier 'strates' est requis +coser.ui.control.replace.find=Chercher \: +coser.ui.control.replace.inField=Dans le champ \: +coser.ui.control.replace.replace=Remplacer \: +coser.ui.control.replace.title=Chercher et remplacer +coser.ui.control.save=Sauvegarder +coser.ui.control.validcontrol=Valider le contr\u00F4le +coser.ui.control.validcontroltip=Marque le contr\u00F4le comme valid\u00E9. Ne peut \u00EAtre effectu\u00E9 qu'apr\u00E8s une v\u00E9rification des donn\u00E9es termin\u00E9e sans erreurs. +coser.ui.error.htmlmessage=Une erreur s'est produite \: %s +coser.ui.error.title=Erreur globale +coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles +coser.ui.graph.lengthStructure=Structures en taille +coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Donn\u00E9es +coser.ui.mainframe.menu.data.control=Contr\u00F4le +coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection +coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection +coser.ui.mainframe.menu.data.noValidation=Contr\u00F4le non valid\u00E9 +coser.ui.mainframe.menu.data.selection=S\u00E9lections +coser.ui.mainframe.menu.file=Fichier +coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais +coser.ui.mainframe.menu.locale.uk=English +coser.ui.mainframe.menu.newProject=Nouveau projet +coser.ui.mainframe.menu.openProject=Ouvrir un projet +coser.ui.mainframe.menu.options=Options +coser.ui.mainframe.menu.quit=Quitter +coser.ui.mainframe.menu.validators=Validateurs +coser.ui.mainframe.menu.view=Vue +coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me +coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.project.captureFile=Fichier de captures \: +coser.ui.project.createProject=Cr\u00E9er le projet +coser.ui.project.creationError=Erreur de cr\u00E9ation +coser.ui.project.customReferenceSpeciesFile=Nouveau fichier de r\u00E9f\u00E9rence \: +coser.ui.project.lengthFile=Fichiers des tailles \: +coser.ui.project.newProject=Nouveau projet +coser.ui.project.openError=Erreur d'ouverture +coser.ui.project.openProject=Ouvrir +coser.ui.project.openProjectTitle=Ouvrir un projet existant +coser.ui.project.project=Projet \: +coser.ui.project.projectauthor=Auteur \: +coser.ui.project.projectcomment=Commentaire \: +coser.ui.project.projectname=Nom du projet \: +coser.ui.project.stratesFile=Fichiers des strates \: +coser.ui.project.traitsFile=Fichiers des traits \: +coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence +coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 (Reftax) \: +coser.ui.result.addNewResult=Enregistrer le r\u00E9sultat +coser.ui.result.addOtherDataFile=Ajouter un fichier +coser.ui.result.availableDataTitle=R\u00E9sultats disponibles \: +coser.ui.result.dataFile1=Fichier r\u00E9sultat 1 \: +coser.ui.result.dataFile2=Fichier r\u00E9sultat 2 \: +coser.ui.result.extractDataButton=Extraire +coser.ui.result.extractDataLabel=Dossier d'extraction \: +coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi +coser.ui.result.newDataTitle=Nouveau r\u00E9sultat +coser.ui.result.otherDataFile=Autre fichiers \: +coser.ui.result.resultName=Nom du r\u00E9sultat \: +coser.ui.result.rsufiVersion=Version de RSufi \: +coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces +coser.ui.selection.createError=Erreur de cr\u00E9action +coser.ui.selection.details.beginDate=Date de d\u00E9but \: +coser.ui.selection.details.comment=Commentaire +coser.ui.selection.details.description=Description \: +coser.ui.selection.details.endDate=Date de fin \: +coser.ui.selection.details.name=Nom de la s\u00E9lection \: +coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection +coser.ui.selection.details.showMapTip=Afficher la carte des zones +coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces +coser.ui.selection.details.species=Esp\u00E8ces \: +coser.ui.selection.details.strata=Strates \: +coser.ui.selection.details.type=Filtrer par type \: +coser.ui.selection.filter.density=Densit\u00E9 \: +coser.ui.selection.filter.filter=Filtrer +coser.ui.selection.filter.occurrence=Occurence \: +coser.ui.selection.fusion.comment=Commentaire \: +coser.ui.selection.fusion.description=Fusion d'esp\u00E8ces. Veuillez renseigner un nouveau nom pr\u00E9sent dans le r\u00E9f\u00E9rentiel. +coser.ui.selection.fusion.name=Nouveau nom \: +coser.ui.selection.fusion.title=Fusion +coser.ui.selection.fusionError=Erreur de fusion +coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! +coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 +coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es +coser.ui.selection.occurrencedensityrenderer=<html>%s(Occ\=%.2f, Dens\=%.2f)</html> +coser.ui.selection.saveError=Erreur de sauvegarde +coser.ui.selection.selection.requiredName=Le champ 'nom' est requis +coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es +coser.ui.selection.speciesMenuFusion=Fusion +coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces +coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection +coser.ui.selection.tab.lists=Listes des esp\u00E8ces +coser.ui.selection.tab.rsufi=RSufi +coser.ui.validation.checkData=V\u00E9rifier les donn\u00E9es +coser.ui.validators.cancel=Annuler +coser.ui.validators.deleteValidator=Supprimer +coser.ui.validators.description=L'application doit \u00EAtre red\u00E9marr\u00E9e apr\u00E8s la modification des validateurs. +coser.ui.validators.entity=Entit\u00E9 +coser.ui.validators.newValidator=Nouveau validateur +coser.ui.validators.title=Validateurs +coser.ui.validators.valid=Valider +coser.ui.validators.validators=Validateurs \:

1 0

r226 - trunk
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 10:23:12 +0000 (Thu, 18 Nov 2010) New Revision: 226 Log: Use i18n 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 09:17:08 UTC (rev 225) +++ trunk/pom.xml 2010-11-18 10:23:12 UTC (rev 226) @@ -222,7 +222,7 @@  <jaxx.version>2.2.4-SNAPSHOT</jaxx.version> - <i18n.version>1.2.2</i18n.version> + <i18n.version>2.0-SNAPSHOT</i18n.version> </properties> <scm>

1 0

r225 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: chatellier Date: 2010-11-18 09:17:08 +0000 (Thu, 18 Nov 2010) New Revision: 225 Log: Fix licenses Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java 2010-11-18 08:47:18 UTC (rev 224) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java 2010-11-18 09:17:08 UTC (rev 225) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-18 08:47:18 UTC (rev 224) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-18 09:17:08 UTC (rev 225) @@ -8,18 +8,18 @@ Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC @@ -62,4 +62,4 @@ <message>coser.ui.control.project.requiredstrataFile</message> </field-validator> </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-18 08:47:18 UTC (rev 224) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-18 09:17:08 UTC (rev 225) @@ -8,18 +8,18 @@ Copyright (C) 2010 Ifremer, Codelutin %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as + it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public + You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC @@ -32,4 +32,4 @@ <message>coser.ui.selection.selection.requiredName</message> </field-validator> </field> -</validators> \ No newline at end of file +</validators>

1 0