From bf3a62a6b42e7faf7a212cb528bf459b2c91f926 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 27 Jun 2022 18:56:53 +0200 Subject: [PATCH] Rename translation key for unlock window title --- src/main/java/org/cryptomator/ui/health/HealthCheckModule.java | 2 +- .../keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java | 3 +-- src/main/resources/i18n/strings.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java index c36f486e0..cb8dc2ff1 100644 --- a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java +++ b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java @@ -81,7 +81,7 @@ abstract class HealthCheckModule { Stage stage = factory.create(); stage.initModality(Modality.WINDOW_MODAL); stage.initOwner(window); - stage.setTitle(String.format(resourceBundle.getString("unlock.title"), vault.getDisplayName())); + stage.setTitle(String.format(resourceBundle.getString("unlock.windowTitle"), vault.getDisplayName())); stage.setResizable(false); return stage; } diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java index b4964f9a0..0d6921ed9 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java @@ -61,6 +61,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { @Override public Masterkey loadKey(URI keyId) throws MasterkeyLoadingFailedException { + window.setTitle(resourceBundle.getString("unlock.windowTitle").formatted(vault.getDisplayName())); Preconditions.checkArgument(SCHEME.equalsIgnoreCase(keyId.getScheme()), "Only supports keys with scheme " + SCHEME); try { Path filePath = vault.getPath().resolve(keyId.getSchemeSpecificPart()); @@ -124,7 +125,6 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { var comp = masterkeyFileChoice.build(); Platform.runLater(() -> { window.setScene(comp.chooseMasterkeyScene()); - window.setTitle(resourceBundle.getString("unlock.chooseMasterkey.title").formatted(vault.getDisplayName())); window.show(); Window owner = window.getOwner(); if (owner != null) { @@ -147,7 +147,6 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { var comp = passphraseEntry.savedPassword(passphrase).build(); Platform.runLater(() -> { window.setScene(comp.passphraseEntryScene()); - window.setTitle(resourceBundle.getString("unlock.title").formatted(vault.getDisplayName())); window.show(); Window owner = window.getOwner(); if (owner != null) { diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index 6e78c76e1..95f28682d 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -101,7 +101,7 @@ forgetPassword.information=This will delete the saved password of this vault fro forgetPassword.confirmBtn=Forget Password # Unlock -unlock.title=Unlock "%s" +unlock.windowTitle=Unlock "%s" unlock.passwordPrompt=Enter password for "%s": unlock.savePassword=Remember Password unlock.unlockBtn=Unlock