Author: chatellier Date: 2009-12-07 15:46:13 +0000 (Mon, 07 Dec 2009) New Revision: 2804 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.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: Add translation for database migration Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-12-07 11:12:57 UTC (rev 2803) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2009-12-07 15:46:13 UTC (rev 2804) @@ -18,6 +18,8 @@ package fr.ifremer.isisfish.datastore.migration; +import static org.nuiton.i18n.I18n._; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -53,11 +55,9 @@ String dbVersion, String applicationVersion) { int answer = JOptionPane.showConfirmDialog( - null, "La base de donn\u00E9e est en version : " + dbVersion - + ".\n\nUne migration en version " + applicationVersion - + " est n\u00E9c\u00E9ssaire.\nVoulez vous migrer la base de donn\u00E9es ?", - "Migration de base de donn\u00E9es", - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + null, _("isisfish.misc.databasemigration.question", dbVersion, applicationVersion), + _("isisfish.misc.databasemigration.title"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); MigrationChoice result = (answer == JOptionPane.YES_OPTION) ? MigrationChoice.MIGRATION : MigrationChoice.NO_MIGRATION; @@ -71,10 +71,10 @@ /** * Perform real migration. * - * @param dbManager - * @param dbVersion - * @param applicationVersion - * @return + * @param dbManager database manager + * @param dbVersion database version + * @param applicationVersion application version + * @return {@code MigrationChoice.CUSTOM_MIGRATION} if success, {@code MigrationChoice.NO_MIGRATION} otherwise. */ protected MigrationChoice migrate(DatabaseManager dbManager, String dbVersion, String applicationVersion) { @@ -118,7 +118,10 @@ } protected void migrateTo3_2(Connection conn) throws SQLException { - log.info("Migrate to version 3.2"); + if (log.isInfoEnabled()) { + log.info("Migrate to version 3.2"); + } + //alteration du schema // nouvelles equations dans les tables @@ -137,9 +140,9 @@ } protected void migrateTo3_3(Connection conn) throws SQLException { - log.info("Migrate to version 3.3"); - //alteration du schema - // nouvelles equations dans les tables + if (log.isInfoEnabled()) { + log.info("Migrate to version 3.3"); + } String[] sqls = new String[] { // replace in equation @@ -157,7 +160,6 @@ "update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;", // add .shp default extension "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null;" - }; for (String sql : sqls) { log.info("try " + sql); 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 2009-12-07 11:12:57 UTC (rev 2803) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-07 15:46:13 UTC (rev 2804) @@ -641,6 +641,8 @@ isisfish.metierSeasonInfoZone.season=Season isisfish.metierSeasonInfoZone.selectSeason=Select a season isisfish.metierSeasonInfoZone.title=Seasons / Zones +isisfish.misc.databasemigration.question=La base de donn\u00E9e est en version \: %s.\n\nUne migration en version %s est n\u00E9c\u00E9ssaire.\nVoulez vous migrer la base de donn\u00E9es ? +isisfish.misc.databasemigration.title=Database migration isisfish.misc.nuitonmigration=IsisFish has detected some code based on CodeLutin libraries in following user scripts.\nDo you want to migrate those script on new nuiton libraries ? isisfish.monitor.title=Application Monitor isisfish.month.april=april 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 2009-12-07 11:12:57 UTC (rev 2803) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-07 15:46:13 UTC (rev 2804) @@ -641,6 +641,8 @@ isisfish.metierSeasonInfoZone.season=Saison isisfish.metierSeasonInfoZone.selectSeason=S\u00E9lectionnez une saison isisfish.metierSeasonInfoZone.title=Saison / Zones +isisfish.misc.databasemigration.question=La base de donn\u00E9e est en version \: %s.\n\nUne migration en version %s est n\u00E9cessaire.\nVoulez vous migrer la base de donn\u00E9es ? +isisfish.misc.databasemigration.title=Migration de base de donn\u00E9es isisfish.misc.nuitonmigration=IsisFish a d\u00E9tect\u00E9 l'utilisation de librairies CodeLutin dans les scripts suivants.\nVoulez vous migrer ces scripts vers les nouvelles librairies nuiton ? isisfish.monitor.title=Moniteur de l'application isisfish.month.april=avril