mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rename recovery_create.fxml file"

Browse Source 
This reverts commit 78e458f01a.
This commit is contained in:
Armin Schrenk
2022-06-28 16:41:53 +02:00
parent 2b19fd6852
commit 737d98775b
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/cryptomator/ui/common/FxmlFile.java
View File

@@ -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"), //

2
src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
View File

@@ -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)

4
src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
View File

@@ -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

5
src/main/resources/fxml/recoverykey_authenticate.fxml → src/main/resources/fxml/recoverykey_create.fxml
View File

@@ -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>

4
src/main/resources/i18n/strings.properties
View File

@@ -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":