diff --git a/plugins/volume_rename/lang/en.hdf b/plugins/volume_rename/lang/en.hdf index 1a75816..587b88c 100644 --- a/plugins/volume_rename/lang/en.hdf +++ b/plugins/volume_rename/lang/en.hdf @@ -11,6 +11,19 @@ Button { } +AdviceMessage { + NoRenameIfActive { + Text = You can not rename a volume while it is active. + Link.Text = Deactivate volume now + Link.Rel = volume_mount + Link.Attr1.name = action + Link.Attr1.value = umount + Link.Attr2.name = redirect + Link.Attr2.value = volume_rename + } +} + + SuccessMessage { VolumeNameChanged { Title = Name changed @@ -20,6 +33,11 @@ SuccessMessage { WarningMessage { + NoRenameIfActive { + Title = Failed to rename the volume + Text = You may not rename a volume while it is active. + } + InvalidVolumeName { Title = Changing of container's name failed Text = The supplied new name of the container was invalid. Please try again! @@ -31,8 +49,8 @@ WarningMessage { } VolumeNameIsInUse { - Title = Volume name is in use - Text = Another volume with the same name is active. + Title = Could not change volume name + Text = The new name is already in use by another volume. } } diff --git a/plugins/volume_rename/volume_rename.cs b/plugins/volume_rename/volume_rename.cs index 5231a89..cbea4dc 100644 --- a/plugins/volume_rename/volume_rename.cs +++ b/plugins/volume_rename/volume_rename.cs @@ -2,13 +2,15 @@

-

- - - - - - - -

+ + + +

+ + + + + +

+ diff --git a/plugins/volume_rename/volume_rename.py b/plugins/volume_rename/volume_rename.py index 4ceed43..73cffe9 100644 --- a/plugins/volume_rename/volume_rename.py +++ b/plugins/volume_rename/volume_rename.py @@ -42,9 +42,11 @@ class volume_rename(CryptoBoxPlugin.CryptoBoxPlugin): try: self.container.setName(vol_name) self.hdf["Data.Success"] = "Plugins.volume_rename.VolumeNameChanged" + except CBVolumeIsActive: + self.hdf["Data.Warning"] = "Plugins.volume_rename.NoRenameIfActive" except CBInvalidName: self.hdf["Data.Warning"] = "Plugins.volume_rename.InvalidVolumeName" - except CBNameActivelyUsed: + except CBNameIsInUse: self.hdf["Data.Warning"] = "Plugins.volume_rename.VolumeNameIsInUse" except CBContainerError: self.hdf["Data.Warning"] = "Plugins.volume_rename.SetVolumeNameFailed"