From 737d98775bc25256316f06c5ed5ef59b164d81fc Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 28 Jun 2022 16:41:53 +0200
Subject: [PATCH] Revert "rename recovery_create.fxml file"

This reverts commit 78e458f01a36d41028f981cef038fc4388298015.
---
 src/main/java/org/cryptomator/ui/common/FxmlFile.java        | 2 +-
 .../org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java | 2 +-
 .../org/cryptomator/ui/recoverykey/RecoveryKeyModule.java    | 4 ++--
 ...recoverykey_authenticate.fxml => recoverykey_create.fxml} | 5 ++---
 src/main/resources/i18n/strings.properties                   | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename src/main/resources/fxml/{recoverykey_authenticate.fxml => recoverykey_create.fxml} (87%)

diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 3f723d109..bc952f9d1 100644
--- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -23,7 +23,7 @@ public enum FxmlFile {
 	MIGRATION_SUCCESS("/fxml/migration_success.fxml"), //
 	PREFERENCES("/fxml/preferences.fxml"), //
 	QUIT("/fxml/quit.fxml"), //
-	RECOVERYKEY_AUTHENTICATE("/fxml/recoverykey_authenticate.fxml"), //
+	RECOVERYKEY_CREATE("/fxml/recoverykey_create.fxml"), //
 	RECOVERYKEY_RECOVER("/fxml/recoverykey_recover.fxml"), //
 	RECOVERYKEY_RESET_PASSWORD("/fxml/recoverykey_reset_password.fxml"), //
 	RECOVERYKEY_SUCCESS("/fxml/recoverykey_success.fxml"), //
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
index ee5ea53d1..cfec43e3e 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
@@ -18,7 +18,7 @@ public interface RecoveryKeyComponent {
 	@RecoveryKeyWindow
 	Stage window();
 
-	@FxmlScene(FxmlFile.RECOVERYKEY_AUTHENTICATE)
+	@FxmlScene(FxmlFile.RECOVERYKEY_CREATE)
 	Lazy<Scene> creationScene();
 
 	@FxmlScene(FxmlFile.RECOVERYKEY_RECOVER)
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index cea20f51c..0522e3a8d 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -72,10 +72,10 @@ abstract class RecoveryKeyModule {
 	// ------------------
 
 	@Provides
-	@FxmlScene(FxmlFile.RECOVERYKEY_AUTHENTICATE)
+	@FxmlScene(FxmlFile.RECOVERYKEY_CREATE)
 	@RecoveryKeyScoped
 	static Scene provideRecoveryKeyCreationScene(@RecoveryKeyWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_AUTHENTICATE);
+		return fxmlLoaders.createScene(FxmlFile.RECOVERYKEY_CREATE);
 	}
 
 	@Provides
diff --git a/src/main/resources/fxml/recoverykey_authenticate.fxml b/src/main/resources/fxml/recoverykey_create.fxml
similarity index 87%
rename from src/main/resources/fxml/recoverykey_authenticate.fxml
rename to src/main/resources/fxml/recoverykey_create.fxml
index 463211f92..971c516af 100644
--- a/src/main/resources/fxml/recoverykey_authenticate.fxml
+++ b/src/main/resources/fxml/recoverykey_create.fxml
@@ -35,13 +35,12 @@
 			</StackPane>
 		</Group>
 		<VBox HBox.hgrow="ALWAYS">
-			<Label styleClass="label-large" text="%recoveryKey.authenticate.title" wrapText="true" textAlignment="LEFT">
+			<Label styleClass="label-large" text="%recoveryKey.create.title" wrapText="true" textAlignment="LEFT">
 				<padding>
 					<Insets bottom="6" top="6"/>
 				</padding>
 			</Label>
-			<!-- TODO: migrate translations -->
-			<FormattedLabel format="%recoveryKey.authenticate.prompt" arg1="${controller.vault.displayName}" wrapText="true">
+			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayName}" wrapText="true">
 				<padding>
 					<Insets bottom="6"/>
 				</padding>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 97e00889c..f523924ab 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -362,8 +362,8 @@ vaultOptions.masterkey.recoverPasswordBtn=Recover Password
 
 # Recovery Key
 recoveryKey.title=Recovery Key
-recoveryKey.authenticate.title=Password required
-recoveryKey.authenticate.prompt=Enter the password for "%s" to show its recovery key.
+recoveryKey.create.title=Password required
+recoveryKey.enterPassword.prompt=Enter the password for "%s" to show its recovery key.
 recoveryKey.display.message=The following recovery key can be used to restore access to "%s":
 recoveryKey.display.StorageHints=Keep it somewhere very secure, e.g.:\n • Store it using a password manager\n • Save it on a USB flash drive\n • Print it on paper
 recoveryKey.recover.prompt=Enter your recovery key for "%s":