mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-09 03:36:48 +00:00
feat(operations): a job's error and warning show in the reader's language
A job stored its error and its result's warning as English text, much of it built with the values in it (volume paths, a disk, libvirt's error), so no catalog could translate it, and the job pages and panel showed English whatever the language. A job now stores them as messages: our English text, marked for translation, and its values; libvirt's own text is a message without values and is shown as it is. The jobs API and pages put them in the reader's language. OperationError keeps its text and values apart for the same reason, so a refusal raised while a job is submitted is shown translated too. Messages one after another still read as sentences. Errors stored before are kept as one message each, shown as they were.
This commit is contained in:
parent
0eab09e19d
commit
1e66367bb4
29 changed files with 927 additions and 333 deletions
|
|
@ -152,6 +152,15 @@ class OperationErrorTestCase(unittest.TestCase):
|
|||
self.assertEqual(str(error), "own message")
|
||||
self.assertIsInstance(error, libvirt.libvirtError)
|
||||
|
||||
def test_keeps_its_text_and_values_apart_for_translation(self):
|
||||
from vrtManager.util import OperationError
|
||||
|
||||
error = OperationError("The pool has no volume named %(name)s", name="a.qcow2")
|
||||
self.assertEqual(str(error), "The pool has no volume named a.qcow2")
|
||||
self.assertEqual((error.text, error.values), ("The pool has no volume named %(name)s", {"name": "a.qcow2"}))
|
||||
# a text without values is not formatted: libvirt's may hold a %
|
||||
self.assertEqual(str(OperationError("100% used")), "100% used")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue