This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit fa9b023598fe253270545ed37cfa2c04f07fa2a7 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Jun 24 17:22:29 2016 +0200 Refs #8314 : Extensions des exports multipostes, correction des libellés --- .../species/edit/actions/ExportMultiPostSpeciesFullAction.java | 4 ++-- .../edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java | 4 ++-- .../ExportMultiPostSpeciesOnlyIndividualObservationsAction.java | 4 ++-- .../species/edit/actions/ImportMultiPostSpeciesFullAction.java | 4 ++-- .../edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java | 4 ++-- .../ImportMultiPostSpeciesOnlyIndividualObservationsAction.java | 4 ++-- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java index 372bfba..cac2d4c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java @@ -48,9 +48,9 @@ public class ExportMultiPostSpeciesFullAction extends ExportMultiPostActionSuppo getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesFull"; - fileExtensionDescription = "tuttiBenthosFull"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesFull"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesFull"); + fileExtension = "tuttiBenthosFull"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosFull"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java index 4ad19dd..4c80759 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java @@ -48,9 +48,9 @@ public class ExportMultiPostSpeciesOnlyFrequenciesAction extends ExportMultiPost getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesOnlyFrequencies"; - fileExtensionDescription = "tuttiBenthosOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + fileExtension = "tuttiBenthosOnlyFrequencies"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyFrequencies"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java index 789c28a..a79e5ce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -48,9 +48,9 @@ public class ExportMultiPostSpeciesOnlyIndividualObservationsAction extends Expo getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesOnlyIndividualObservations"; - fileExtensionDescription = "tuttiBenthosOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + fileExtension = "tuttiBenthosOnlyIndividualObservations"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyIndividualObservations"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java index 39d27f5..ff21592 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java @@ -43,9 +43,9 @@ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupp getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesFull"; - fileExtensionDescription = "tuttiBenthosFull"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesFull"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesFull"); + fileExtension = "tuttiBenthosFull"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosFull"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java index 8f0264f..86dc3d8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java @@ -43,9 +43,9 @@ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPost getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesOnlyFrequencies"; - fileExtensionDescription = "tuttiBenthosOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + fileExtension = "tuttiBenthosOnlyFrequencies"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyFrequencies"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java index c8ac064..6616c18 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -43,9 +43,9 @@ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends Impo getUI().getSpeciesOrBenthosContext()); if (isSpecies) { fileExtension = "tuttiSpeciesOnlyIndividualObservations"; - fileExtensionDescription = "tuttiBenthosOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); } else { - fileExtension = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + fileExtension = "tuttiBenthosOnlyIndividualObservations"; fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyIndividualObservations"); } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 9e80615..95c1637 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -138,6 +138,9 @@ tutti.common.file.pdf= tutti.common.file.protocol= tutti.common.file.tuttiAccidental= tutti.common.file.tuttiBenthos= +tutti.common.file.tuttiBenthosFull= +tutti.common.file.tuttiBenthosOnlyFrequencies= +tutti.common.file.tuttiBenthosOnlyIndividualObservations= tutti.common.file.tuttiCatch= tutti.common.file.tuttiIndividualObservation= tutti.common.file.tuttiMarineLitter= -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.