[Isis-fish-commits] r1648 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/i18n

9 Dec 2008

Author: chatellier
Date: 2008-12-09 13:49:41 +0000 (Tue, 09 Dec 2008)
New Revision: 1648

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Update vcs update messages and switch

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java	2008-12-09 13:49:16 UTC (rev 1647)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java	2008-12-09 13:49:41 UTC (rev 1648)
@@ -193,26 +193,29 @@
         public boolean canDoAction(VCS vcs, VCSActionEvent action, File... files) {
             boolean result = true;
             if (action == VCSActionEvent.SWITCH_PROTOCOL) {
-                result = ask(_("Protocol to access repository script has changed.\n" +
-                        "Do you want to switch your repository ?"));
+                result = ask(_("isisfish.vcs.switchprotocol.confirm"));
                 if (!result) {
                     // l'utilisateur ne souhaite pas changer de protocol, 
                     // on force le repo en read-only pour eviter les erreurs
                     vcs.setWriteable(false);
                 }
             } else if (action == VCSActionEvent.SWITCH) {
-                result = ask(_("You don't use correction repository script for" +
-                        " your application version %s.\nDo you want to switch" +
-                        " your repository ?", IsisConfig.getVersion()));
+                result = ask(_("isisfish.vcs.switchversion.confirm", IsisConfig.getVersion()));
                 if (!result) {
                     // l'utilisateur ne souhaite pas changer de branche,
                     // on force le repo en read-only pour eviter les erreurs
                     vcs.setWriteable(false);
                 }
             } else if (action == VCSActionEvent.UPDATE_REPOSITORY) {
-                result = ask(_("Your repository is not up to date.\n" +
-                        "Do you want to update your repository ?\n\n" +
-                        "Remote modified file is\n%s", Arrays.toString(files)));
+                
+                // consctuit une chaine plutot qu'un Arrays.toString() qui
+                // est illisible
+                String modifiedFiles = "";
+                for(File file : files) {
+                    modifiedFiles += " - " + file.toString() + "\n";
+                }
+                
+                result = ask(_("isisfish.vcs.updaterepository.confirm", modifiedFiles));
             }
             return result;
         }
@@ -224,7 +227,7 @@
      * quit l'application
      * 
      * @param msg
-     * @return
+     * @return true if user confirm question
      */
     public static boolean ask(String msg) {
         boolean result = true;

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2008-12-09 13:49:16 UTC (rev 1647)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2008-12-09 13:49:41 UTC (rev 1648)
@@ -46,7 +46,6 @@
 No\ database\ version\ %s\ found\ and\ can't\ get\ it.\\n=
 Normal\ stop\ thread,\ this\ is\ not\ an\ error=
 Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
-Protocol\ to\ access\ repository\ script\ has\ changed.\\n=
 Region\ %s\ allready\ exist\ in\ repository.\ Cant\ import=
 Region\ %s\ already\ inited=
 Rename\ data\ directory\ to\ %s=
@@ -62,9 +61,7 @@
 The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.=
 Use\ branches,\ switch\ not\ needed=
 User\ stop\ simulation\ %s=
-You\ don't\ use\ correction\ repository\ script\ for=
 Your\ database\ repository\:\ %s\\n\ don't\ use\ correct=
-Your\ repository\ is\ not\ up\ to\ date.\\n=
 add\ %s\ as\ updated\ file=
 could\ not\ close\ reader\ %1$s=could not close reader %1$s
 could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
@@ -902,6 +899,8 @@
 isisfish.vcs.commit.cancel=vcs.commit.cancel
 isisfish.vcs.commit.label=vcs.commit.label
 isisfish.vcs.commit.ok=vcs.commit.ok
+isisfish.vcs.switchprotocol.confirm=Protocol to access repository script has changed.\nDo you want to switch your repository ?
+isisfish.vcs.switchversion.confirm=You don't use correct repository script for your application version %s.\nDo you want to switch your repository ?
 isisfish.vcs.update=vcs.update
 isisfish.vcs.update.cancel=cancel
 isisfish.vcs.update.checkAll=checkAll
@@ -928,6 +927,7 @@
 isisfish.vcs.updateconfirm.label2=
 isisfish.vcs.updateconfirm.ok=ok
 isisfish.vcs.updateconfirm.tooltip.checkAll=
+isisfish.vcs.updaterepository.confirm=Your repository is not up to date.\nDo you want to update your repository ?\n\nRemote modified file is \:\n%s
 isisfish.versionStorage.removed=Removed
 isisfish.vesselType.activityRange=Activity range
 isisfish.vesselType.comments=Comments

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2008-12-09 13:49:16 UTC (rev 1647)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2008-12-09 13:49:41 UTC (rev 1648)
@@ -46,7 +46,6 @@
 No\ database\ version\ %s\ found\ and\ can't\ get\ it.\\n=
 Normal\ stop\ thread,\ this\ is\ not\ an\ error=
 Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
-Protocol\ to\ access\ repository\ script\ has\ changed.\\n=
 Region\ %s\ allready\ exist\ in\ repository.\ Cant\ import=
 Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e
 Rename\ data\ directory\ to\ %s=
@@ -62,9 +61,7 @@
 The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.=
 Use\ branches,\ switch\ not\ needed=
 User\ stop\ simulation\ %s=
-You\ don't\ use\ correction\ repository\ script\ for=
 Your\ database\ repository\:\ %s\\n\ don't\ use\ correct=
-Your\ repository\ is\ not\ up\ to\ date.\\n=
 add\ %s\ as\ updated\ file=Ajout du fichier %s
 could\ not\ close\ reader\ %1$s=could not close reader %1$s
 could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
@@ -902,6 +899,8 @@
 isisfish.vcs.commit.cancel=annuler
 isisfish.vcs.commit.label=Entrer quelques mots concernant la modification des scripts
 isisfish.vcs.commit.ok=confirmer
+isisfish.vcs.switchprotocol.confirm=Le protocole d'acc\u00E8s au d\u00E9p\u00F4t des scripts a chang\u00E9.\nVoulez-vous changer vers le nouveau d\u00E9p\u00F4t ?
+isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le d\u00E9p\u00F4t correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de d\u00E9p\u00F4t ?
 isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur
 isisfish.vcs.update.cancel=annuler
 isisfish.vcs.update.checkAll=(de)-select tout
@@ -928,6 +927,7 @@
 isisfish.vcs.updateconfirm.label2='Etes vous sur de vouloir effectuer ces op\u00E9rations ?'
 isisfish.vcs.updateconfirm.ok=confirmer
 isisfish.vcs.updateconfirm.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts que vous voulez traiter
+isisfish.vcs.updaterepository.confirm=Votre d\u00E9p\u00F4t des scripts n'est pas \u00E0 jour.\nVoulez-vous mettre \u00E0 jour votre d\u00E9p\u00F4t ?\n\nLes fichiers modifi\u00E9s sont \:\n%s
 isisfish.versionStorage.removed=Surim\u00E9
 isisfish.vesselType.activityRange=Intervalle d'activit\u00E9
 isisfish.vesselType.comments=Commentaires

    

[Isis-fish-commits] r1648 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/i18n

chatellier＠users.labs.libre-entreprise.org