r1005 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home resources/i18n - Tutti-commits

24 May 2013

Author: kmorin
Date: 2013-05-24 15:20:36 +0200 (Fri, 24 May 2013)
New Revision: 1005

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1005

Log:
fixes #2453 [RAPPORT] erreur ?\195?\160 la g?\195?\169n?\195?\169ration du rapport pour le mail

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java	2013-05-24 12:54:22 UTC (rev 1004)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java	2013-05-24 13:20:36 UTC (rev 1005)
@@ -26,6 +26,7 @@
 
 import com.google.common.base.Preconditions;
 import fr.ifremer.tutti.TuttiIOUtil;
+import fr.ifremer.tutti.TuttiTechnicalException;
 import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.service.catches.ExportCatchesReportService;
 import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
@@ -33,6 +34,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.swing.*;
 import java.io.File;
 
 import static org.nuiton.i18n.I18n._;
@@ -104,9 +106,18 @@
                 getContext().getGeneratePDFService();
         service.generatePDFFile(file, cruise.getId(), getConfig().getI18nLocale());
 
-        TuttiUIUtil.mail(_("tutti.sendCruiseReport.mail.subject", cruise.getName()),
-                         _("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath()));
+        try  {
+            throw new TuttiTechnicalException();
+//            TuttiUIUtil.mail(_("tutti.sendCruiseReport.mail.subject", cruise.getName()),
+//                             _("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath()));
 
+        } catch (TuttiTechnicalException e) {
+            JOptionPane.showMessageDialog(getContext().getMainUI(),
+                                          _("tutti.sendCruiseReport.action.error.mail.message", file),
+                                          _("tutti.sendCruiseReport.action.error.mail.title"),
+                                          JOptionPane.WARNING_MESSAGE);
+        }
+
     }
 
     @Override

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties	2013-05-24 12:54:22 UTC (rev 1004)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties	2013-05-24 13:20:36 UTC (rev 1005)
@@ -1256,6 +1256,8 @@
 tutti.selectSpecies.action.validate.tip=
 tutti.selectSpecies.title=
 tutti.sendCruiseReport.action.chooseFile=
+tutti.sendCruiseReport.action.error.mail.message=
+tutti.sendCruiseReport.action.error.mail.title=
 tutti.sendCruiseReport.action.success=
 tutti.sendCruiseReport.mail.body=
 tutti.sendCruiseReport.mail.subject=

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-05-24 12:54:22 UTC (rev 1004)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-05-24 13:20:36 UTC (rev 1005)
@@ -1211,6 +1211,8 @@
 tutti.selectSpecies.action.validate.tip=Valider la sélection de l'espèce
 tutti.selectSpecies.title=Choisissez une espèce
 tutti.sendCruiseReport.action.chooseFile=Choisir le fichier de rapport
+tutti.sendCruiseReport.action.error.mail.message=<html>Le client email n'a pas pu être ouvert.<hr/>Vous pouvez ouvrir manuellement votre client email et ajouter le fichier<br/><em>%s</em><br/>en pièce-jointe.</html>
+tutti.sendCruiseReport.action.error.mail.title=Impossible d'ouvrir le client d'email
 tutti.sendCruiseReport.action.success=Les captures ont correctement été exporté dans le fichier %s
 tutti.sendCruiseReport.mail.body=Bonjour,\n\nVeuillez trouver ci-joint le rapport des captures de la campagne %1s.\n*Pensez à joindre le fichier %2s*\n\nCordialement,\n\n*Votre nom*
 tutti.sendCruiseReport.mail.subject=Captures de la campagne %s

    

r1005 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home resources/i18n

kmorin＠users.forge.codelutin.com

tags

participants (1)