Author: echatellier Date: 2012-08-20 18:36:35 +0200 (Mon, 20 Aug 2012) New Revision: 1057 Url: http://forge.codelutin.com/repositories/revision/coser/1057 Log: Quand je renomme j'ai "Les esp?\195?\168ces "ALLOSUB" ont ?\195?\169t?\195?\169 fusionn?\195?\169es en "ALLOMED"" il faudrait avoir "L'esp?\195?\168ce "ALLOSUB" a ?\195?\169t?\195?\169 renomm?\195?\169e en "ALLOMED" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.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/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 16:36:35 UTC (rev 1057) @@ -376,13 +376,24 @@ @Override public String getLogString(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - return _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + String log = null; + if (speciesNames.length == 1) { + log = _("coser.business.command.mergespecies.rename.log", newSpecyName, speciesAsString); + } else { + log = _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + } + return log; } @Override public String getDescription(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - String desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + String desc = null; + if (speciesNames.length == 1) { + desc = _("coser.business.command.mergespecies.rename.desc", newSpecyName, speciesNames.length, speciesAsString); + } else { + desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + } if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } 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 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=In file %s, line %s has been deleted coser.business.command.mergespecies.desc=Merge %2$s species into "%1$s" \: %3$s coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s" +coser.business.command.mergespecies.rename.desc=Species "%3$s" has been renamed to "%1$s" +coser.business.command.mergespecies.rename.log=Species "%2$s" has been renamed to "%1$s" coser.business.command.modifyfield.desc=File %1$s, %3$s field modification (line %2$s) coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s" coser.business.common.length=Length 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 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a été supprimée coser.business.command.mergespecies.desc=%2$s espèces ont été fusionnées en "%1$s" \: %3$s coser.business.command.mergespecies.log=Les espèces "%2$s" ont été fusionnées en "%1$s" +coser.business.command.mergespecies.rename.desc=L'espèce "%3$s" a été renommée en "%1$s" +coser.business.command.mergespecies.rename.log=L'espèce "%2$s" a été renommée en "%1$s" coser.business.command.modifyfield.desc=Fichier %1$s, modification du champ "%3$s" (ligne %2$s) coser.business.command.modifyfield.log=Dans le ficher %s à la ligne %s, le champs "%s" est passé de la valeur "%s" à "%s" coser.business.common.length=Taille @@ -133,7 +135,7 @@ coser.business.publication.selectionchoices=Choix de sélections coser.business.publication.selectionlogexporttitle=Rapport de la sélection %s (projet %s) coser.business.publication.stratafilename=Nom du fichier strates -coser.business.result.rsufiResultAlreadyExists=Le résultat %D existe déjà \! +coser.business.result.rsufiResultAlreadyExists=Le résultat %s existe déjà \! coser.business.resultupload.duplicatedresult=Le résultat %s/%s/%s duplique un autre résultat pour la zone %s \! coser.business.selection.notValidatedControl=Contrôle non validé \! coser.business.uploadresult.checkcollision=Vérification des collisions de zones