From 4138747fc3ee83238e11800c7efb4f9d81027bf4 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 25 Jul 2019 12:41:02 +0200 Subject: [PATCH] Localizable file picker title --- .../ui/addvaultwizard/ChooseExistingVaultController.java | 8 +++++--- main/ui/src/main/resources/i18n/strings.properties | 1 + main/ui/src/main/resources/i18n/strings_en.properties | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 53f701281..c4ab87ab2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -14,6 +14,7 @@ import org.cryptomator.ui.model.VaultFactory; import javax.inject.Inject; import java.io.File; import java.nio.file.Path; +import java.util.ResourceBundle; @AddVaultWizardScoped public class ChooseExistingVaultController implements FxController { @@ -23,21 +24,22 @@ public class ChooseExistingVaultController implements FxController { private final ObjectProperty vaultPath; private final ObservableList vaults; private final VaultFactory vaultFactory; + private final ResourceBundle resourceBundle; @Inject - ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty vaultPath, ObservableList vaults, VaultFactory vaultFactory) { + ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty vaultPath, ObservableList vaults, VaultFactory vaultFactory, ResourceBundle resourceBundle) { this.window = window; this.fxmlLoaders = fxmlLoaders; this.vaultPath = vaultPath; this.vaults = vaults; this.vaultFactory = vaultFactory; + this.resourceBundle = resourceBundle; } @FXML public void chooseFile() { FileChooser fileChooser = new FileChooser(); - //TODO: Title is part of the localization. => inject resource bundle and get correct title - fileChooser.setTitle("TODO Open Masterkey File"); + fileChooser.setTitle(resourceBundle.getString("addvaultwizard.existing.filePickerTitle")); fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator")); final File file = fileChooser.showOpenDialog(window); if (file != null) { diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties index 01535ffe0..60f05f5dd 100644 --- a/main/ui/src/main/resources/i18n/strings.properties +++ b/main/ui/src/main/resources/i18n/strings.properties @@ -1,4 +1,5 @@ addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file of your existing vault +addvaultwizard.existing.filePickerTitle=Open Masterkey File main.closeBtn.tooltip=Close main.settingsBtn.tooltip=Settings preferences.autoUpdateCheck=Check for updates automatically diff --git a/main/ui/src/main/resources/i18n/strings_en.properties b/main/ui/src/main/resources/i18n/strings_en.properties index 01535ffe0..60f05f5dd 100644 --- a/main/ui/src/main/resources/i18n/strings_en.properties +++ b/main/ui/src/main/resources/i18n/strings_en.properties @@ -1,4 +1,5 @@ addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file of your existing vault +addvaultwizard.existing.filePickerTitle=Open Masterkey File main.closeBtn.tooltip=Close main.settingsBtn.tooltip=Settings preferences.autoUpdateCheck=Check for updates automatically