From 181e45a5967b8e949324d33572a6dcafbebfce6b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 12 Mar 2025 15:27:24 +0100 Subject: [PATCH] renamed event list item localization keys --- .../ui/eventview/EventListCellController.java | 38 ++++++++--------- src/main/resources/i18n/strings.properties | 41 ++++++++++--------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java b/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java index 966db546b..a9a27613b 100644 --- a/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java @@ -126,59 +126,59 @@ public class EventListCellController implements FxController { private void adjustToBrokenFileNodeEvent(BrokenFileNodeEvent bfe) { eventIcon.setValue(FontAwesome5Icon.TIMES); - eventMessage.setValue(resourceBundle.getString("event.brokenFileNode.message")); + eventMessage.setValue(resourceBundle.getString("eventView.entry.brokenFileNode.message")); eventDescription.setValue(bfe.ciphertextPath().getFileName().toString()); if (revealService != null) { - addAction("event.brokenFileNode.showEncrypted", () -> reveal(revealService, convertVaultPathToSystemPath(bfe.ciphertextPath()))); + addAction("eventView.entry.brokenFileNode.showEncrypted", () -> reveal(revealService, convertVaultPathToSystemPath(bfe.ciphertextPath()))); } else { addAction("event.brokenFileNode.copyEncrypted", () -> copyToClipboard(convertVaultPathToSystemPath(bfe.ciphertextPath()).toString())); } - addAction("event.brokenFileNode.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(bfe.cleartextPath()).toString())); + addAction("eventView.entry.brokenFileNode.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(bfe.cleartextPath()).toString())); } private void adjustToConflictResolvedEvent(ConflictResolvedEvent cre) { eventIcon.setValue(FontAwesome5Icon.CHECK); - eventMessage.setValue(resourceBundle.getString("event.conflictResolved.message")); + eventMessage.setValue(resourceBundle.getString("eventView.entry.conflictResolved.message")); eventDescription.setValue(cre.resolvedCiphertextPath().getFileName().toString()); if (revealService != null) { - addAction("event.conflictResolved.showDecrypted", () -> reveal(revealService, convertVaultPathToSystemPath(cre.resolvedCleartextPath()))); + addAction("eventView.entry.conflictResolved.showDecrypted", () -> reveal(revealService, convertVaultPathToSystemPath(cre.resolvedCleartextPath()))); } else { - addAction("event.conflictResolved.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(cre.resolvedCleartextPath()).toString())); + addAction("eventView.entry.conflictResolved.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(cre.resolvedCleartextPath()).toString())); } } private void adjustToConflictEvent(ConflictResolutionFailedEvent cfe) { eventIcon.setValue(FontAwesome5Icon.COMPRESS_ALT); - eventMessage.setValue(resourceBundle.getString("event.conflict.message")); + eventMessage.setValue(resourceBundle.getString("eventView.entry.conflict.message")); eventDescription.setValue(cfe.conflictingCiphertextPath().getFileName().toString()); if (revealService != null) { - addAction("event.conflict.showDecrypted", () -> reveal(revealService, convertVaultPathToSystemPath(cfe.canonicalCleartextPath()))); - addAction("event.conflict.showEncrypted", () -> reveal(revealService, cfe.conflictingCiphertextPath())); + addAction("eventView.entry.conflict.showDecrypted", () -> reveal(revealService, convertVaultPathToSystemPath(cfe.canonicalCleartextPath()))); + addAction("eventView.entry.conflict.showEncrypted", () -> reveal(revealService, cfe.conflictingCiphertextPath())); } else { - addAction("event.conflict.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(cfe.canonicalCleartextPath()).toString())); - addAction("event.conflict.copyEncrypted", () -> copyToClipboard(cfe.conflictingCiphertextPath().toString())); + addAction("eventView.entry.conflict.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(cfe.canonicalCleartextPath()).toString())); + addAction("eventView.entry.conflict.copyEncrypted", () -> copyToClipboard(cfe.conflictingCiphertextPath().toString())); } } private void adjustToDecryptionFailedEvent(DecryptionFailedEvent dfe) { eventIcon.setValue(FontAwesome5Icon.BAN); - eventMessage.setValue(resourceBundle.getString("event.decryptionFailed.message")); + eventMessage.setValue(resourceBundle.getString("eventView.entry.decryptionFailed.message")); eventDescription.setValue(dfe.ciphertextPath().getFileName().toString()); if (revealService != null) { - addAction("event.decryptionFailed.showEncrypted", () -> reveal(revealService, dfe.ciphertextPath())); + addAction("eventView.entry.decryptionFailed.showEncrypted", () -> reveal(revealService, dfe.ciphertextPath())); } else { - addAction("event.decryptionFailed.copyEncrypted", () -> copyToClipboard(dfe.ciphertextPath().toString())); + addAction("eventView.entry.decryptionFailed.copyEncrypted", () -> copyToClipboard(dfe.ciphertextPath().toString())); } } private void adjustToBrokenDirFileEvent(BrokenDirFileEvent bde) { eventIcon.setValue(FontAwesome5Icon.TIMES); - eventMessage.setValue(resourceBundle.getString("event.brokenDirFile.message")); + eventMessage.setValue(resourceBundle.getString("eventView.entry.brokenDirFile.message")); eventDescription.setValue(bde.ciphertextPath().getParent().getFileName().toString()); if (revealService != null) { - addAction("event.brokenDirFile.showEncrypted", () -> reveal(revealService, bde.ciphertextPath())); + addAction("eventView.entry.brokenDirFile.showEncrypted", () -> reveal(revealService, bde.ciphertextPath())); } else { - addAction("event.brokenDirFile.copyEncrypted", () -> copyToClipboard(bde.ciphertextPath().toString())); + addAction("eventView.entry.brokenDirFile.copyEncrypted", () -> copyToClipboard(bde.ciphertextPath().toString())); } } @@ -202,7 +202,7 @@ public class EventListCellController implements FxController { if (vaultUnlocked.getValue()) { return eventMessage.getValue(); } else { - return resourceBundle.getString("event.vaultLocked.message"); + return resourceBundle.getString("eventView.entry.vaultLocked.message"); } } @@ -211,7 +211,7 @@ public class EventListCellController implements FxController { return eventDescription.getValue(); } else { var e = event.getValue(); - return resourceBundle.getString("event.vaultLocked.description").formatted(e != null ? e.v().getDisplayName() : ""); + return resourceBundle.getString("eventView.entry.vaultLocked.description").formatted(e != null ? e.v().getDisplayName() : ""); } } diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index bd813daa3..610f10b54 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -584,23 +584,24 @@ shareVault.hub.openHub=Open Cryptomator Hub # Event View eventView.title=Events eventView.filter.allVaults=All -eventView.clearListButton.tooltip=Remove all -event.vaultLocked.message=*********** -event.vaultLocked.description=Unlock "%s" for details -event.conflictResolved.message=Resolved conflict -event.conflictResolved.showDecrypted=Show decrypted file -event.conflictResolved.copyDecrypted=Copy decrypted path -event.conflict.message=Conflict resolution failed -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.message=Decryption failed -event.decryptionFailed.showEncrypted=Show encrypted file -event.decryptionFailed.copyEncrypted=Copy encrypted path -event.brokenDirFile.message=Broken directory link -event.brokenDirFile.showEncrypted=Show broken, encrypted link -event.brokenDirFile.copyEncrypted=Copy path of broken link -event.brokenFileNode.message=Broken filesystem node -event.brokenFileNode.showEncrypted=Show broken, encrypted node -event.brokenFileNode.copyDecrypted=Copy decrypted path +eventView.clearListButton.tooltip=Dismiss all +## event list entries +eventView.entry.vaultLocked.message=*********** +eventView.entry.vaultLocked.description=Unlock "%s" for details +eventView.entry.conflictResolved.message=Resolved conflict +eventView.entry.conflictResolved.showDecrypted=Show decrypted file +eventView.entry.conflictResolved.copyDecrypted=Copy decrypted path +eventView.entry.conflict.message=Conflict resolution failed +eventView.entry.conflict.showDecrypted=Show decrypted, original file +eventView.entry.conflict.copyDecrypted=Copy decrypted, original path +eventView.entry.conflict.showEncrypted=Show conflicting, encrypted file +eventView.entry.conflict.copyEncrypted=Copy conflicting, encrypted path +eventView.entry.decryptionFailed.message=Decryption failed +eventView.entry.decryptionFailed.showEncrypted=Show encrypted file +eventView.entry.decryptionFailed.copyEncrypted=Copy encrypted path +eventView.entry.brokenDirFile.message=Broken directory link +eventView.entry.brokenDirFile.showEncrypted=Show broken, encrypted link +eventView.entry.brokenDirFile.copyEncrypted=Copy path of broken link +eventView.entry.brokenFileNode.message=Broken filesystem node +eventView.entry.brokenFileNode.showEncrypted=Show broken, encrypted node +eventView.entry.brokenFileNode.copyDecrypted=Copy decrypted path