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

1 files changed, 33 insertions, 38 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java
index 3a0aabdd..8e11e484 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java
@@ -51,6 +51,7 @@ import org.openslx.dozmod.gui.changemonitor.GenericControlWindow;
 import org.openslx.dozmod.gui.configurator.NetrulesConfigurator.StateWrapper;
 import org.openslx.dozmod.gui.control.WordWrapLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
+import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
@@ -196,11 +197,13 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 	
 	private void showPresetSelector() {
 		if (predefinedRules == null) {
-			Gui.showMessageBox("Wah wah wah! Null preset list", MessageType.ERROR, null, null);
+			Gui.showMessageBox(I18n.CONFIGURATOR.getString("NetRules.Message.error.noPredefinedRules"),
+					MessageType.ERROR, null, null);
 			return;
 		}
 		final JDialog dialog = new JDialog(SwingUtilities.getWindowAncestor(this),
-				"Auswahl", ModalityType.APPLICATION_MODAL);
+				I18n.CONFIGURATOR.getString("NetRules.Dialog.dialog.title"),
+				ModalityType.APPLICATION_MODAL);
 		JPanel pane = new JPanel();
 		pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
 				.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel");
@@ -216,7 +219,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 		dialog.setMinimumSize(dd);
 		dialog.setPreferredSize(dd);
 		GridManager grid = new GridManager(pane, 3, true, new Insets(2, 2, 2, 2));
-		grid.add(new WordWrapLabel("Vordefinierte Regelsets:"), 3);
+		grid.add(new WordWrapLabel(I18n.CONFIGURATOR.getString("NetRules.Label.predefinedRules.text")), 3);
 		grid.nextRow();
 		final Map<ButtonModel, Integer> mapper = new HashMap<>();
 		for (PresetNetRule ruleSet : predefinedRules) {
@@ -231,8 +234,8 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 		grid.add(Box.createVerticalGlue(), 3).expand(true, true).fill(true, true);
 		grid.nextRow();
 		grid.add(Box.createHorizontalGlue()).expand(true, false).fill(true, false);
-		JButton btnCancel = new JButton("Abbrechen");
-		JButton btnOk = new JButton("Speichern");
+		JButton btnCancel = new JButton(I18n.CONFIGURATOR.getString("NetRules.Button.cancel.text"));
+		JButton btnOk = new JButton(I18n.CONFIGURATOR.getString("NetRules.Button.ok.text"));
 		grid.add(btnCancel);
 		grid.add(btnOk);
 		grid.finish(false);
@@ -386,9 +389,9 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 				// log numbers for fields independently...
 				LOGGER.debug("Invalid number of fields! Expected 3, got: " + fields.length);
 				if (fields.length > 3) {
-					errors.append("Zeile " + lineNo + ": Zu viele Felder.\n");
+					errors.append(I18n.CONFIGURATOR.getString("NetRules.Message.error.tooManyFields", lineNo));
 				} else {
-					errors.append("Zeile " + lineNo + ": Zu wenig Felder.\n");
+					errors.append(I18n.CONFIGURATOR.getString("NetRules.Message.error.tooFewFields", lineNo));
 				}
 				invalid = true;
 				continue;
@@ -404,7 +407,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 			if (!ruleDirection.equals("IN") && !ruleDirection.equals("OUT")) {
 				lineNo += addLine(newdoc, ruleLine, Color.RED, true);
 				LOGGER.debug("Invalid net direction! Expected 'in' or out'. Got: " + ruleDirection);
-				errors.append("Zeile " + lineNo + ": Ungültige Richtung. Bitte nutzen Sie 'IN' bzw. 'OUT'.\n");
+				errors.append(I18n.CONFIGURATOR.getString("NetRules.Message.error.invalidNetDirection", lineNo));
 				invalid = true;
 				continue;
 			}
@@ -415,7 +418,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 			if (port < 0 || port > 65535) {
 				lineNo += addLine(newdoc, ruleLine, Color.RED, true);
 				LOGGER.debug("Invalid port! Got: " + port);
-				errors.append("Zeile " + lineNo + ": Ungültiger Port. Gültiger Bereich ist 0-65535.\n");
+				errors.append(I18n.CONFIGURATOR.getString("NetRules.Message.error.invalidPort", lineNo));
 				invalid = true;
 				continue;
 			}
@@ -429,7 +432,8 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 			String checkRes = checkHostnameSimple(fields[0]);
 			if (checkRes != null) {
 				lineNo += addLine(newdoc, ruleLine, Color.RED, true);
-				errors.append("Zeile " + lineNo + ": " + checkRes + "\n");
+				errors.append(I18n.CONFIGURATOR.getString("NetRules.Message.error.checkResWithLineNo",
+						lineNo, checkRes));
 				invalid = true;
 				continue;
 			}
@@ -442,10 +446,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 			resetTabStops();
 		}
 		if (!silent && errors.length() != 0) {
-			Gui.showMessageBox("Fehler beim Auswerten der angegebenen Netzwerkregeln.\n\n" + errors.toString()
-					+ "\nBitte geben Sie die Regeln zeilenweise im Format\n"
-					+ "<host> <port> <IN|OUT>\n"
-					+ "an.",
+			Gui.showMessageBox(I18n.CONFIGURATOR.getString("NetRules.Message.error.evaluatingNetRules", errors.toString()),
 					MessageType.ERROR, null, null);
 		}
 		if (invalid) {
@@ -486,7 +487,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 	 */
 	private String checkHostnameSimple(String hostname) {
 		if (hostname.length() > 254) {
-			return "Hostname ist zu lang.";
+			return I18n.CONFIGURATOR.getString("NetRules.Message.error.hostnameTooLong");
 		}
 		boolean allNumeric = true;
 		int netmask = -1;
@@ -495,7 +496,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 		if (ls != -1) {
 			netmask = Util.parseInt(hostname.substring(ls + 1), -1);
 			if (netmask == -1) {
-				return "Ungültige Netzmaske.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.invalidNetmask");
 			}
 			hostname = hostname.substring(0, ls);
 		}
@@ -509,18 +510,18 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 			// v6
 			if ((hostname.startsWith(":") && !hostname.startsWith("::"))
 					|| (hostname.endsWith(":") && ! hostname.endsWith("::"))) {
-				return "IPv6-Adresse darf nicht mit einem Doppelpunkt beginnen oder enden.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6BeginOrEndWithColon");
 			}
 			int numCompressed = (hostname.length() - hostname.replace("::", "").length()) / 2;
 			if (numCompressed > 1) {
-				return "IPv6-Adresse darf nicht mehr als einen komprimierten Teil enthalten.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6MoreThanOneCompressedPart");
 			}
 			if (netmask > 128) {
-				return "IPv6 Netzmaske kann nicht größer 128 Bit sein.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6GreaterThan128Bits");
 			}
 			domainLabels = hostname.split(":");
 			if (domainLabels.length > 8) {
-				return "IPv6-Adresse enthält zu viele Hextets."; // Yes it's called that apparently
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6TooManyHextets"); // Yes it's called that apparently
 			}
 			for (String domainLabel : domainLabels) {
 				if (domainLabel.isEmpty())
@@ -528,26 +529,27 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 				try {
 					int test = Integer.parseInt(domainLabel, 16);
 					if (test < 0 || test > 65535) {
-						return "IPv6-Adresse enthält ungültiges Hextet.";
+						return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6InvalidHextet");
 					}
 				} catch (Exception e) {
-					return "IPv6-Adresse enthält nicht-hexadezimale Zeichen."; 
+					return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv6NonHexadecimalCharacters");
 				}
 			}
 			if (!allNumeric
 					|| ((domainLabels.length == 8 || numCompressed > 0) && (netmask < -1 || netmask > 128))
 					|| (domainLabels.length < 8 && numCompressed == 0 && (netmask < 0 || netmask > 128))) {
-				return "Fehlerhafte IPv6-Adresse/Netzmaske.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.incorrectIPv6AddressOrNetmask");
 			}
 		} else {
 			// v4 or hostname
 			if (netmask > 32) {
-				return "IPv4 Netzmaske kann nicht größer 32 Bit sein.";
+				return I18n.CONFIGURATOR.getString("NetRules.Message.error.IPv4GreaterThan32Bits");
 			}
 			for (String domainLabel : domainLabels) {
 				if (domainLabel.length() > 63) {
 					// fail since domain level should be max 63 chars
-					return "Domain-Ebene '" + domainLabel + "' länger als 63 Zeichen.";
+					return I18n.CONFIGURATOR.getString("NetRules.Message.error.domainLabelLongerThan63Characters",
+							domainLabel);
 				}
 				int i = Util.parseInt(domainLabel, -1);
 				if (i < 0 || i > 255) {
@@ -559,7 +561,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 				if ((domainLabels.length == 4 && (netmask < -1 || netmask > 32))
 						|| domainLabels.length > 4
 						|| (domainLabels.length < 4 && (netmask < 0 || netmask > 32))) {
-					return "Fehlerhafte IPv4-Adresse/Netzmaske.";
+					return I18n.CONFIGURATOR.getString("NetRules.Message.error.incorrectIPv4AddressOrNetmask");
 				}
 			}
 		}
@@ -574,13 +576,6 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements
 class NetrulesConfiguratorLayout extends JPanel {
 
 	private static final long serialVersionUID = 5266120380443817325L;
-	private final static String STR_RULES_DESCRIPTION = "Wenn Sie den Internetzugriff deaktiviert haben,"
-			+ " können Sie hier Ausnahmen definieren (Whitelist)."
-			+ " Bitte definieren Sie Ihre Regeln im Format\n<host> <port> <in|out>.\n"
-			+ "Sie können Port 0 angeben, was sämtlichen TCP und UDP Ports eines Hosts entspricht.";
-	private final static String STR_RULES_ADD = "Wenn Sie Internetzugriff aktivieren,"
-			+ " hat diese Liste den gegenteiligen Effekt (Blacklist).";
-	private final static String STR_TITLE = "Netzwerkregeln";
 
 	protected final JTextPane tpNetworkRules;
 	protected final JButton btnCheckRules;
@@ -592,19 +587,19 @@ class NetrulesConfiguratorLayout extends JPanel {
 				new Insets(5, 5, 5, 5));
 
 		// middle panel for network rules
-		this.setBorder(BorderFactory.createTitledBorder(STR_TITLE));
+		this.setBorder(BorderFactory.createTitledBorder(I18n.CONFIGURATOR.getString("NetRules.TitledBorder.title")));
 		tpNetworkRules = new JTextPane();
 		resetTabStops();
 
 		grid
-				.add(new WordWrapLabel(STR_RULES_DESCRIPTION), 2)
+				.add(new WordWrapLabel(I18n.CONFIGURATOR.getString("NetRules.Label.description.text")), 2)
 				.fill(true, false).expand(true, false);
 		grid.nextRow();
 
 		grid
-				.add(new WordWrapLabel(STR_RULES_ADD))
+				.add(new WordWrapLabel(I18n.CONFIGURATOR.getString("NetRules.Label.add.text")))
 				.fill(true, false).expand(true, false);
-		btnCheckRules = new JButton("Regeln überprüfen");
+		btnCheckRules = new JButton(I18n.CONFIGURATOR.getString("NetRules.Button.checkRules.text"));
 		grid.add(btnCheckRules);
 		grid.nextRow();
 
@@ -614,7 +609,7 @@ class NetrulesConfiguratorLayout extends JPanel {
 				.fill(true, true).expand(true, true);
 		grid.nextRow();
 		
-		btnShowPresets = new JButton("Vordefinierte Regelsets...");
+		btnShowPresets = new JButton(I18n.CONFIGURATOR.getString("NetRules.Button.showPresets.text"));
 		grid.add(btnShowPresets, 2).anchor(GridBagConstraints.LINE_END);
 		grid.nextRow();