* umount failure message was never displayed

* strings were missing for "emptypassword"
This commit is contained in:
age 2007-07-10 10:36:45 +00:00
parent 84fbe10488
commit 92528e4da2
2 changed files with 7 additions and 2 deletions

View file

@ -72,5 +72,10 @@ WarningMessage {
Title = Already closed Title = Already closed
Text = The volume is already closed. Text = The volume is already closed.
} }
EmptyPassword {
Title = Empty password
Text = There was no password supplied.
}
} }

View file

@ -96,7 +96,7 @@ class volume_mount(cryptobox.plugins.base.CryptoBoxPlugin):
self.cbox.log.info("the device (%s) is already mounted" % self.device) self.cbox.log.info("the device (%s) is already mounted" % self.device)
return "volume_status" return "volume_status"
if not pw: if not pw:
self.hdf["Data.Warning"] = "EmptyPassword" self.hdf["Data.Warning"] = "Plugins.volume_mount.EmptyPassword"
self.cbox.log.info("no password was supplied for mounting of device: '%s'" \ self.cbox.log.info("no password was supplied for mounting of device: '%s'" \
% self.device) % self.device)
return "volume_status" return "volume_status"
@ -125,7 +125,7 @@ class volume_mount(cryptobox.plugins.base.CryptoBoxPlugin):
try: try:
self.container.umount() self.container.umount()
except CBUmountError, err_msg: except CBUmountError, err_msg:
self.hdf["Data.Warning"] = "UmountFailed" self.hdf["Data.Warning"] = "Plugins.volume_mount.UmountFailed"
self.cbox.log.warn("could not umount the volume (%s): %s" \ self.cbox.log.warn("could not umount the volume (%s): %s" \
% (self.device, err_msg)) % (self.device, err_msg))
return "volume_status" return "volume_status"