Browse Source

adjust event description when locked

Armin Schrenk 1 month ago
parent
commit
6d9704ffa2

+ 2 - 2
src/main/java/org/cryptomator/ui/eventview/EventListCellController.java

@@ -165,7 +165,6 @@ public class EventListCellController implements FxController {
 		if (vaultUnlocked.getValue()) {
 			return eventMessage.getValue();
 		} else {
-			var e = event.getValue();
 			return resourceBundle.getString("event.vaultLocked.message");
 		}
 	}
@@ -174,7 +173,8 @@ public class EventListCellController implements FxController {
 		if (vaultUnlocked.getValue()) {
 			return eventDescription.getValue();
 		} else {
-			return resourceBundle.getString("event.vaultLocked.description");
+			var e = event.getValue();
+			return resourceBundle.getString("event.vaultLocked.description").formatted(e != null? e.v().getDisplayName():"");
 		}
 	}
 

+ 1 - 1
src/main/resources/fxml/eventview_cell.fxml

@@ -25,7 +25,7 @@
 	</VBox>
 	<VBox spacing="4" HBox.hgrow="ALWAYS">
 		<Label styleClass="header-label" text="${controller.message}"/>
-		<Label styleClass="detail-label" text="${controller.description}" textOverrun="CENTER_ELLIPSIS" />
+		<Label text="${controller.description}"/>
 	</VBox>
 	<Button fx:id="eventActionsButton" contentDisplay="GRAPHIC_ONLY" onAction="#toggleEventActionsMenu" managed="${controller.actionsButtonVisible}" visible="${controller.actionsButtonVisible}">
 		<graphic>

+ 17 - 16
src/main/resources/i18n/strings.properties

@@ -1,21 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 additionalStyleSheets=
 
-#Test
-event.vaultLocked.message=***********
-event.vaultLocked.description=Unlock the vault to display details
-event.conflictResolved.description=Resolved conflict
-event.conflictResolved.showDecrypted=Show decrypted file
-event.conflictResolved.copyDecrypted=Copy decrypted path
-event.conflict.description=Cannot resolve conflict.
-event.conflict.showDecrypted=Show decrypted, original file
-event.conflict.copyDecrypted=Copy decrypted, original path
-event.conflict.showEncrypted=Show conflicting, encrypted file
-event.conflict.copyEncrypted=Copy conflicting, encrypted path
-event.decryptionFailed.description=Decryption failed.
-event.decryptionFailed.showEncrypted=Show encrypted file
-event.decryptionFailed.copyEncrypted=Copy encrypted path
-
 # Generics
 generic.action.dismiss=Dismiss
 ## Button
@@ -594,4 +579,20 @@ shareVault.hub.message=How to share a Hub vault
 shareVault.hub.description=In order to share the vault content with another team member, you have to perform two steps:
 shareVault.hub.instruction.1=1. Share access of the encrypted vault folder via cloud storage.
 shareVault.hub.instruction.2=2. Grant access to team member in Cryptomator Hub.
-shareVault.hub.openHub=Open Cryptomator Hub
+shareVault.hub.openHub=Open Cryptomator Hub
+
+# Event View
+event.vaultLocked.message=***********
+event.vaultLocked.description=Unlock vault "%s" for details
+event.conflictResolved.description=Resolved conflict
+event.conflictResolved.showDecrypted=Show decrypted file
+event.conflictResolved.copyDecrypted=Copy decrypted path
+event.conflict.description=Cannot resolve conflict.
+event.conflict.showDecrypted=Show decrypted, original file
+event.conflict.copyDecrypted=Copy decrypted, original path
+event.conflict.showEncrypted=Show conflicting, encrypted file
+event.conflict.copyEncrypted=Copy conflicting, encrypted path
+event.decryptionFailed.description=Decryption failed.
+event.decryptionFailed.showEncrypted=Show encrypted file
+event.decryptionFailed.copyEncrypted=Copy encrypted path
+