mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-08 19:26: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
|
|
@ -5,7 +5,7 @@ from django.utils.http import url_has_allowed_host_and_scheme
|
|||
from django.utils.translation import gettext_lazy as _
|
||||
from libvirt import libvirtError
|
||||
from operations import claims, jobs
|
||||
from operations.utils import busy_message, public_error_text, summary
|
||||
from operations.utils import busy_message, public_error_text, said, summary, words
|
||||
|
||||
API_PREFIX = "/api/"
|
||||
# scripts only from this site: no inline script or event handler runs (inline styles still do);
|
||||
|
|
@ -34,7 +34,7 @@ def error_text(request, exception):
|
|||
"""
|
||||
user = getattr(request, "user", None)
|
||||
if user and (user.is_superuser or user.has_perm("instances.view_instances")):
|
||||
return str(exception)
|
||||
return words(said(exception))
|
||||
return public_error_text(exception)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue