Author: tchemit Date: 2012-03-10 02:36:11 +0100 (Sat, 10 Mar 2012) New Revision: 348 Url: http://forge.codelutin.com/repositories/revision/echobase/348 Log: use real version Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-03-10 00:55:19 UTC (rev 347) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-03-10 01:36:11 UTC (rev 348) @@ -133,10 +133,11 @@ } public Version getApplicationVersion() { - String versionStr = - applicationConfig.getOption(EchoBaseConfigurationOption.VERSION.key); - String s = VersionUtil.removeSnapshot(versionStr); - Version v = VersionUtil.valueOf(s); +// String versionStr = +// applicationConfig.getOption(EchoBaseConfigurationOption.VERSION.key); +// String s = VersionUtil.removeSnapshot(versionStr); +// Version v = VersionUtil.valueOf(s); + Version v = applicationConfig.getOptionAsVersion(EchoBaseConfigurationOption.VERSION.key); Preconditions.checkNotNull(v); return v; } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-10 00:55:19 UTC (rev 347) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-10 01:36:11 UTC (rev 348) @@ -1,4 +1,5 @@ echobase.action.cancel=Cancel +echobase.action.createNewMission=Create a new mission echobase.action.generateSqlQuery=Generate request echobase.action.newLibreOfficeQuery=New Libre office request echobase.action.newQuery=New request @@ -20,7 +21,6 @@ echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' echobase.error.invalid.sql=Invalid request \: %s echobase.error.login.unknown=Unkwon login -echobase.action.createNewMission=Create a new mission echobase.error.mission.name.already.exist=Mission name already exists echobase.error.no.embeddedApplication.configurationFound= echobase.error.no.embeddedApplication.exportFileFound= Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-10 00:55:19 UTC (rev 347) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-10 01:36:11 UTC (rev 348) @@ -6,6 +6,7 @@ echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application echobase.action.createMission=Créer la mission +echobase.action.createNewMission=Créer une nouvelle mission echobase.action.createSqlQuery=Enregistrer echobase.action.delete=Suppression echobase.action.deleteSqlQuery=Supprimer @@ -17,7 +18,6 @@ echobase.action.generateSqlQuery=Générer la requète echobase.action.import=Importer echobase.action.importTable=Importer -echobase.action.createNewMission=Créer une nouvelle mission echobase.action.locale.english=Anglais echobase.action.locale.french=Français echobase.action.login=Connection