[client] Add resource bundle files for activity classes. Update the activity classes accordingly.

7 files changed, 81 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
index a9631097..2a9b2334 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/DownloadPanel.java
@@ -9,6 +9,7 @@ import org.openslx.bwlp.thrift.iface.TransferState;
 import org.openslx.dozmod.filetransfer.DownloadTask;
 import org.openslx.dozmod.filetransfer.TransferEvent;
 import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.QuitNotification;
 import org.openslx.dozmod.util.DesktopEnvironment;
@@ -24,7 +25,7 @@ public class DownloadPanel extends TransferPanel implements ActionListener, Quit
 
 	public DownloadPanel(String displayName, String diskFile, DownloadTask download) {
 		super(download, displayName, diskFile);
-		btnOpenFolder = new JButton("Ordner öffnen");
+		btnOpenFolder = new JButton(I18n.ACTIVITY.getString("DownloadPanel.Button.openFolder.text"));
 		btnOpenFolder.setEnabled(false);
 		header.add(btnOpenFolder, 6);
 		btnOpenFolder.addActionListener(this);
@@ -37,7 +38,7 @@ public class DownloadPanel extends TransferPanel implements ActionListener, Quit
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == btnClose) {
 			if (!download.isCanceled()) {
-				if (!Gui.showMessageBox(panel, "Wollen Sie diesen Transfer wirklich abbrechen?",
+				if (!Gui.showMessageBox(panel, I18n.ACTIVITY.getString("DownloadPanel.Message.yesNo.cancelTransfer"),
 						MessageType.QUESTION_YESNO, null, null))
 					return;
 				download.cancel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java
index 64e6b994..aa461286 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java
@@ -5,6 +5,7 @@ import java.awt.event.ActionListener;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.filetransfer.TransferEventEmitter;
+import org.openslx.dozmod.gui.helper.I18n;
 
 @SuppressWarnings("serial")
 public class PassiveUploadPanel extends TransferPanel {
@@ -16,11 +17,11 @@ public class PassiveUploadPanel extends TransferPanel {
 	private final PassiveUploadPanel panel = this;
 
 	public PassiveUploadPanel(TransferEventEmitter state, String name) {
-		super(state, name, "<Transfer zwischen Masterserver und Satellitenserver>");
+		super(state, name, I18n.ACTIVITY.getString("PassiveUploadPanel.TransferPanel.fileName"));
 		btnClose.addActionListener(new ButtonAction());
 		this.state = state;
 		state.addListener(this);
-		btnClose.setText("Ausblenden");
+		btnClose.setText(I18n.ACTIVITY.getString("PassiveUploadPanel.Button.close.text"));
 	}
 
 	private class ButtonAction implements ActionListener {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
index 00ce10d3..eb752b30 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
@@ -17,6 +17,7 @@ import org.openslx.dozmod.filetransfer.TransferEventListener;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.BlockProgressBar;
 import org.openslx.dozmod.gui.control.QLabel;
+import org.openslx.dozmod.gui.helper.I18n;
 
 @SuppressWarnings("serial")
 public abstract class TransferPanel extends ActivityPanel implements TransferEventListener {
@@ -56,7 +57,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 		// Header: [status] VM-Name ---- fileName [Button]
 		header = new JPanel();
 		header.setLayout(new BoxLayout(header, BoxLayout.LINE_AXIS));
-		lblStatus = new QLabel("Initialisiere");
+		lblStatus = new QLabel(I18n.ACTIVITY.getString("TransferPanel.TransferState.initialize"));
 		header.add(lblStatus);
 		header.add(Box.createHorizontalStrut(10));
 		QLabel vmName = new QLabel(displayName);
@@ -68,7 +69,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 		lblFilename.setMinimumSize(new Dimension(0, 0));
 		header.add(lblFilename);
 		header.add(Box.createHorizontalStrut(10));
-		btnClose = new JButton("Abbrechen");
+		btnClose = new JButton(I18n.ACTIVITY.getString("TransferPanel.Button.close.text.0"));
 		header.add(btnClose);
 		add(header);
 		progressWrapper = new JPanel();
@@ -124,20 +125,20 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 					switch (event.state) {
 					case ERROR:
 						errorCountdown = 20;
-						status = "Fehler";
+						status = I18n.ACTIVITY.getString("TransferPanel.TransferState.error");
 						if (transfer.isCanceled()) {
 							transfer.removeListener(panel);
 						}
 						break;
 					case FINISHED:
 						transferDone();
-						status = "Beendet";
+						status = I18n.ACTIVITY.getString("TransferPanel.TransferState.finished");
 						break;
 					case IDLE:
-						status = "Inaktiv";
+						status = I18n.ACTIVITY.getString("TransferPanel.TransferState.idle");
 						break;
 					case WORKING:
-						status = "Übertragung läuft";
+						status = I18n.ACTIVITY.getString("TransferPanel.TransferState.working");
 						break;
 					default:
 						status = event.state.toString();
@@ -168,7 +169,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 	private void transferDone() {
 		transfer.removeListener(panel);
 		lblRemaining.setText("-");
-		btnClose.setText("Schließen");
+		btnClose.setText(I18n.ACTIVITY.getString("TransferPanel.Button.close.text.1"));
 		lblFilename.setText("");
 		footer.setVisible(false);
 		progressWrapper.setVisible(false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
index 41b53302..4c4c392b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java
@@ -11,6 +11,7 @@ import javax.swing.SwingUtilities;
 
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
+import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.window.CheckUpdateWindow;
 import org.openslx.dozmod.util.DesktopEnvironment;
 import org.openslx.dozmod.util.DesktopEnvironment.Link;
@@ -40,12 +41,16 @@ public class UpdatePanel extends ActivityPanel implements ActionListener {
 		// Header: Neue Version verfügbar: <newVersion> [Button]
 		header = new JPanel();
 		header.setLayout(new BoxLayout(header, BoxLayout.LINE_AXIS));
-		lblInfo = new QLabel("Neue Version verfügbar: " + newVersion, Gui.getScaledIconResource("/img/upload-icon.png", "!", 32, this), QLabel.LEFT);
+		lblInfo = new QLabel(I18n.ACTIVITY.getString("UpdatePanel.Label.info.text", newVersion),
+				Gui.getScaledIconResource("/img/upload-icon.png", "!", 32, this), QLabel.LEFT);
 		header.add(lblInfo);
 		header.add(Box.createHorizontalGlue());
-		btnLink = new JButton("Im Browser öffnen", Gui.getScaledIconResource("/img/download-icon.png", "!", 24, this));
-		btnDetails = new JButton("Changelog", Gui.getScaledIconResource("/img/info-icon.png", "?", 24, this));
-		btnClose = new JButton("Schließen", Gui.getScaledIconResource("/img/delete-icon.png", "X", 24, this));
+		btnLink = new JButton(I18n.ACTIVITY.getString("UpdatePanel.Button.link.text"),
+				Gui.getScaledIconResource("/img/download-icon.png", "!", 24, this));
+		btnDetails = new JButton(I18n.ACTIVITY.getString("UpdatePanel.Button.details.text"),
+				Gui.getScaledIconResource("/img/info-icon.png", "?", 24, this));
+		btnClose = new JButton(I18n.ACTIVITY.getString("UpdatePanel.Button.close.text"),
+				Gui.getScaledIconResource("/img/delete-icon.png", "X", 24, this));
 		btnLink.addActionListener(this);
 		btnClose.addActionListener(this);
 		header.add(btnLink);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
index bc24758a..b9b106f6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
@@ -13,6 +13,7 @@ import org.openslx.bwlp.thrift.iface.TAuthorizationException;
 import org.openslx.bwlp.thrift.iface.TInvalidTokenException;
 import org.openslx.bwlp.thrift.iface.UploadOptions;
 import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.QuitNotification;
 import org.openslx.dozmod.state.UploadWizardState;
@@ -40,7 +41,7 @@ public class UploadPanel extends TransferPanel implements QuitNotification {
 				|| Session.getSatelliteConfig().serverSideCopy != SscMode.USER) {
 			chkServerSideCopy = null;
 		} else {
-			chkServerSideCopy = new JCheckBox("ServerSide Copy");
+			chkServerSideCopy = new JCheckBox(I18n.ACTIVITY.getString("UploadPanel.CheckBox.serverSideCopy.text"));
 			footer.add(Box.createHorizontalStrut(15));
 			footer.add(chkServerSideCopy);
 			chkServerSideCopy.addActionListener(new SscToggle());
@@ -54,7 +55,7 @@ public class UploadPanel extends TransferPanel implements QuitNotification {
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			if (!state.getUploadTask().isCanceled()) {
-				if (!Gui.showMessageBox(panel, "Wollen Sie diesen Transfer wirklich abbrechen?",
+				if (!Gui.showMessageBox(panel, I18n.ACTIVITY.getString("UploadPanel.Message.yesNo.cancelTransfer"),
 						MessageType.QUESTION_YESNO, null, null))
 					return;
 				QuickTimer.scheduleOnce(new Task() {
@@ -84,7 +85,7 @@ public class UploadPanel extends TransferPanel implements QuitNotification {
 					} catch (TAuthorizationException | TInvalidTokenException e) {
 						dis = true;
 					} catch (TException e) {
-						Gui.asyncMessageBox("Unerwarteter Fehler beim Setzen der Transferoptionen",
+						Gui.asyncMessageBox(I18n.ACTIVITY.getString("UploadPanel.Message.error.setUploadOptions"),
 								MessageType.ERROR, LOGGER, e);
 					}
 					final UploadOptions newOptions = newOpt;
diff --git a/dozentenmodul/src/main/properties/i18n/activity.properties b/dozentenmodul/src/main/properties/i18n/activity.properties
new file mode 100644
index 00000000..739bf806
--- /dev/null
+++ b/dozentenmodul/src/main/properties/i18n/activity.properties
@@ -0,0 +1,27 @@
+# DownloadPanel
+DownloadPanel.Button.openFolder.text=Ordner öffnen
+DownloadPanel.Message.yesNo.cancelTransfer=Wollen Sie diesen Transfer wirklich abbrechen?
+
+# PassiveUploadPanel
+PassiveUploadPanel.TransferPanel.fileName=<Transfer zwischen Masterserver und Satellitenserver>
+PassiveUploadPanel.Button.close.text=Ausblenden
+
+# TransferPanel
+TransferPanel.TransferState.initialize=Initialisiere
+TransferPanel.Button.close.text.0=Abbrechen
+TransferPanel.TransferState.error=Fehler
+TransferPanel.TransferState.finished=Beendet
+TransferPanel.TransferState.idle=Inaktiv
+TransferPanel.TransferState.working=Übertragung läuft
+TransferPanel.Button.close.text.1=Schließen
+
+# UpdatePanel
+UpdatePanel.Label.info.text=Neue Version verfügbar: {0}
+UpdatePanel.Button.link.text=Im Browser öffnen
+UpdatePanel.Button.details.text=Changelog
+UpdatePanel.Button.close.text=Schließen
+
+# UploadPanel
+UploadPanel.CheckBox.serverSideCopy.text=ServerSide Copy
+UploadPanel.Message.yesNo.cancelTransfer=Wollen Sie diesen Transfer wirklich abbrechen?
+UploadPanel.Message.error.setUploadOptions=Unerwarteter Fehler beim Setzen der Transferoptionen
\ No newline at end of file
diff --git a/dozentenmodul/src/main/properties/i18n/activity_en_US.properties b/dozentenmodul/src/main/properties/i18n/activity_en_US.properties
new file mode 100644
index 00000000..2d0b0e5c
--- /dev/null
+++ b/dozentenmodul/src/main/properties/i18n/activity_en_US.properties
@@ -0,0 +1,27 @@
+# DownloadPanel
+DownloadPanel.Button.openFolder.text=Open folder
+DownloadPanel.Message.yesNo.cancelTransfer=Do you really want to cancel this transfer?
+
+# PassiveUploadPanel
+PassiveUploadPanel.TransferPanel.fileName=<Transfer between master server and satellite server>
+PassiveUploadPanel.Button.close.text=Hide
+
+# TransferPanel
+TransferPanel.TransferState.initialize=Initialize
+TransferPanel.Button.close.text.0=Cancel
+TransferPanel.TransferState.error=Error
+TransferPanel.TransferState.finished=Completed
+TransferPanel.TransferState.idle=Inactive
+TransferPanel.TransferState.working=Transfer in progress
+TransferPanel.Button.close.text.1=Close
+
+# UpdatePanel
+UpdatePanel.Label.info.text=New version available: {0}
+UpdatePanel.Button.link.text=Open in browser
+UpdatePanel.Button.details.text=Changelog
+UpdatePanel.Button.close.text=Close
+
+# UploadPanel
+UploadPanel.CheckBox.serverSideCopy.text=ServerSide Copy
+UploadPanel.Message.yesNo.cancelTransfer=Do you really want to cancel this transfer?
+UploadPanel.Message.error.setUploadOptions=Unexpected error while setting the transfer options
\ No newline at end of file