Sfoglia il codice sorgente

use defaults.vault.vaultName as fallback displayName

Jan-Peter Klein 5 giorni fa
parent
commit
8fac541024

+ 6 - 3
src/main/java/org/cryptomator/common/recovery/VaultPreparator.java

@@ -10,10 +10,10 @@ import org.cryptomator.integrations.mount.MountService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.ResourceBundle;
 
 import static org.cryptomator.common.vaults.VaultState.Value.LOCKED;
 
@@ -23,13 +23,16 @@ public final class VaultPreparator {
 
 	private VaultPreparator() {}
 
-	public static Vault prepareVault(Path selectedDirectory, VaultComponent.Factory vaultComponentFactory, List<MountService> mountServices) {
+	public static Vault prepareVault(Path selectedDirectory, //
+									 VaultComponent.Factory vaultComponentFactory, //
+									 List<MountService> mountServices, //
+									 ResourceBundle resourceBundle) {
 		VaultSettings vaultSettings = VaultSettings.withRandomId();
 		vaultSettings.path.set(selectedDirectory);
 		if (selectedDirectory.getFileName() != null) {
 			vaultSettings.displayName.set(selectedDirectory.getFileName().toString());
 		} else {
-			vaultSettings.displayName.set("defaultVaultName");
+			vaultSettings.displayName.set(resourceBundle.getString("defaults.vault.vaultName"));
 		}
 
 		var wrapper = new VaultConfigCache(vaultSettings);

+ 1 - 1
src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -272,7 +272,7 @@ public class VaultListController implements FxController {
 			return;
 		}
 
-		Vault preparedVault = VaultPreparator.prepareVault(path, vaultComponentFactory, mountServices);
+		Vault preparedVault = VaultPreparator.prepareVault(path, vaultComponentFactory, mountServices, resourceBundle);
 		VaultListManager.redetermineVaultState(preparedVault);
 
 		switch (preparedVault.getState()) {