From 232898fb193f53515b85673fd7a79645731d9eb9 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Wed, 11 May 2016 17:51:23 +0200
Subject: [PATCH] i18n for #5758
---
.../OSGI-INF/l10n/messages.properties | 8 ++++----
.../OSGI-INF/l10n/messages_de.properties | 8 ++++----
.../src/main/java/eu/etaxonomy/taxeditor/Messages.java | 2 ++
.../eu/etaxonomy/taxeditor/store/CdmStoreConnector.java | 2 +-
.../view/datasource/handler/ChangeConnectionHandler.java | 3 +--
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
index ad2787688..17944cdf5 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
@@ -21,12 +21,12 @@ UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Could not open external browser. URI
UriWithLabelElement_INVALID_URL=Invalid URI
UriWithLabelElement_OPEN_EXTERNAL_BROWSER=Open in external browser
-ChangeConnectionHandler_ALREADY_CONNECTING=Already connecting
-ChangeConnectionHandler_CONFIRM_DATASOURCE=Confirm Datasource Connection
-ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY=You are currently connecting to a different datasource already.
ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE=Chosen datasource is not available
-ChangeConnectionHandler_REALLY_WANT_TO_CONNECT=Do you really want to connect to this datasource?\n\n
+ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY=You are currently creating a data model for a datasource already.
+ChangeConnectionHandler_ALREADY_CONNECTING=Already creating data model
ChangeConnectionHandler_NOT_AVAILABLE_REASONS=This could mean that either the database server is not running or the machine is not reachable.\n\n Please also make sure that you are connected to the network when trying to connect to a remote datasource.
+ChangeConnectionHandler_CREATE_DATAMODEL=Create Data Model
+ChangeConnectionHandler_REALLY_CREATE_DATAMODEL=Do you want to create the data model for %s?\n\nNote: Creating the data model may take some time.
LoginDialog_CANCEL_MESSAGE=Aborting the login procedure will close the database.
LoginDialog_LOGIN=Login
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
index 7cab6fc63..95d4ac24a 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
@@ -20,12 +20,12 @@ UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Externer Browser konnte nicht ge
UriWithLabelElement_INVALID_URL=Ung\u00FCltige URI
UriWithLabelElement_OPEN_EXTERNAL_BROWSER=Im Browser öffnen
-ChangeConnectionHandler_ALREADY_CONNECTING=Verbindung wird aufgebaut
-ChangeConnectionHandler_CONFIRM_DATASOURCE=Verbindung bestätigen
-ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY=Es wird schon eine Verbindung zu einer Datenquelle aufgebaut
+ChangeConnectionHandler_ALREADY_CONNECTING=Datenmodell wird erstellt
+ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY=Es wird schon das Datenmodell für eine Datenquelle erstellt
ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE=Gewählte Datenquelle nicht verfügbar
-ChangeConnectionHandler_REALLY_WANT_TO_CONNECT=Wollen Sie sich wirklich mit dieser Datenquelle verbinden?\n\n
ChangeConnectionHandler_NOT_AVAILABLE_REASONS=Eventuell ist der Server nicht verfügbar oder erreichbar.\n\nStellen Sie bitte auch sicher, dass sie Netzzugang haben, wenn sie sich zu einer Remote-Datenquelle verbinden.
+ChangeConnectionHandler_CREATE_DATAMODEL=Datenmodell erstellen
+ChangeConnectionHandler_REALLY_CREATE_DATAMODEL=Wollen sie wirklich das Datenmodell für %s erstellen?\n\nHinweis: Die Erstellung kann einige Zeit dauern.
LoginDialog_CANCEL_MESSAGE=Ein Abbruch wird die Verbindung zur Datenquelle schließen.
LoginDialog_LOGIN=Login
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
index 9d094c53a..35e13d5fa 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
@@ -47,6 +47,8 @@ public class Messages extends NLS {
public static String ChangeConnectionHandler_ALREADY_CONNECTING;
public static String ChangeConnectionHandler_CONFIRM_DATASOURCE;
public static String ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY;
+ public static String ChangeConnectionHandler_CREATE_DATAMODEL;
+ public static String ChangeConnectionHandler_REALLY_CREATE_DATAMODEL;
public static String ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE;
public static String ChangeConnectionHandler_REALLY_WANT_TO_CONNECT;
public static String ChangeConnectionHandler_NOT_AVAILABLE_REASONS;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
index 3beb0d77c..6eecb7f51 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
@@ -64,7 +64,7 @@ class CdmStoreConnector extends Job {
ICdmSource cdmSource,
DbSchemaValidation dbSchemaValidation,
Resource applicationContextBean) {
- super("Connecting to datasource: " + cdmSource);
+ super(String.format("Creating data model for %s", cdmSource));
this.display = display;
this.cdmSource = cdmSource;
this.dbSchemaValidation = dbSchemaValidation;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
index 2c140c247..ba5e5c463 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
@@ -44,8 +44,7 @@ public class ChangeConnectionHandler extends AbstractHandler {
try {
container.getCdmSource().checkConnection();
- boolean confirmed = MessagingUtils.confirmDialog(Messages.ChangeConnectionHandler_CONFIRM_DATASOURCE, Messages.ChangeConnectionHandler_REALLY_WANT_TO_CONNECT
- + container.getCdmSource().getName());
+ boolean confirmed = MessagingUtils.confirmDialog(Messages.ChangeConnectionHandler_CREATE_DATAMODEL, String.format(Messages.ChangeConnectionHandler_REALLY_CREATE_DATAMODEL, container.getCdmSource().getName()));
if(confirmed){
CdmDataSourceRepository.changeDataSource(container.getCdmSource());
--
2.34.1