exception was renamed

minor language fixes
This commit is contained in:
lars 2006-11-14 12:32:17 +00:00
parent 23bb313594
commit f1f1c05226
3 changed files with 34 additions and 12 deletions

View File

@ -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.
}
}

View File

@ -2,13 +2,15 @@
<h3><?cs var:html_escape(Lang.Plugins.volume_rename.Title.ChangeVolumeName) ?></h3>
<p>
<?cs call:print_form_header("set_name", "volume_rename") ?>
<label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label>
<input type="text" name="vol_name" tabindex="10" size="15" id="vol_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
<input type="hidden" name="store" value="set_name" />
<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Plugins.volume_rename.Button.ContainerNameSet) ?></button>
</form>
</p>
<?cs if:Data.CurrentDisk.active ?>
<?cs call:hint("Plugins.volume_rename.NoRenameIfActive") ?>
<?cs else ?>
<p><?cs call:print_form_header("set_name", "volume_rename") ?>
<label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label>
<input type="text" name="vol_name" tabindex="10" size="15" id="vol_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
<input type="hidden" name="store" value="set_name" />
<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Plugins.volume_rename.Button.ContainerNameSet) ?></button>
</form></p>
<?cs /if ?>

View File

@ -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"