From 19f1093d2c147814f63c0f7b00575956412b69a3 Mon Sep 17 00:00:00 2001
From: armin <armin.schrenk@skymatic.de>
Date: Sun, 11 Aug 2019 16:29:04 +0200
Subject: [PATCH] replacing hardcoded descriptions by reference to
 strings.properties for addvault existing controller

---
 .../main/resources/fxml/addvault_existing.fxml  |  8 ++++----
 .../src/main/resources/i18n/strings.properties  | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml
index 454cff7cd..e1c116c52 100644
--- a/main/ui/src/main/resources/fxml/addvault_existing.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml
@@ -21,14 +21,14 @@
 		<Region VBox.vgrow="ALWAYS"/>
 		<Label text="%addvaultwizard.existing.instruction"/>
 		<HBox spacing="18">
-			<TextField promptText="TODO" text="${controller.vaultPath}" disable="true" HBox.hgrow="ALWAYS"/>
-			<Button text="TODO filepicker" onAction="#chooseFile" HBox.hgrow="NEVER" prefWidth="120"/>
+			<TextField promptText="%addvaultwizard.existing.promptText" text="${controller.vaultPath}" disable="true" HBox.hgrow="ALWAYS"/>
+			<Button text="%addvaultwizard.existing.filePickerButton" onAction="#chooseFile" HBox.hgrow="NEVER" prefWidth="120"/>
 		</HBox>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+I">
 			<buttons>
-				<Button text="TODO Back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
-				<Button text="TODO Open" ButtonBar.buttonData="FINISH" onAction="#finish" defaultButton="true" disable="${controller.vaultPathIsNull}"/>
+				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
+				<Button text="%generic.button.open" ButtonBar.buttonData="FINISH" onAction="#finish" defaultButton="true" disable="${controller.vaultPathIsNull}"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index febde60af..5f546734a 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -1,14 +1,27 @@
-#add Vault Dialogues
+#Generics
+##Button
+generic.button.back=Back
+generic.button.next=Next
+generic.button.open=Open
+
+#Add Vault Dialogues
+##Welcome
 addvaultwizard.welcome.instruction=TODO new vault or existing vault?
 addvaultwizard.welcome.newButton=TODO new vault
 addvaultwizard.welcome.existingButton=TODO exising vault
-addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file of your existing vault. The directory contain it will be displayed. 
+##Existing
+addvaultwizard.existing.promptText=TODO prompt
+addvaultwizard.existing.filePickerButton=TODO Filepicker
+addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file of your existing vault.The path to the vault will be displayed.
 addvaultwizard.existing.filePickerTitle=Open Masterkey File
+##New
 addvaultwizard.new.insertName=Please enter a name for the vault.
 addvaultwizard.new.selectLocation=Please pick a directory where your vault is stored:
 addvaultwizard.new.directoryPickerTitle=Select Directory
 addvaultwizard.new.enterPassword=Please enter a Password for your vault:
 addvaultwizard.new.reenterPassword=Please retype the password:
+
+
 main.closeBtn.tooltip=Close
 main.settingsBtn.tooltip=Settings
 preferences.title=Preferences