From e97d592e511d76e039683d1f0b4ce665d6519758 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 12 Jun 2020 14:46:17 +0300 Subject: [PATCH] fix some messages, add translation for some keywords, update tr locale file --- accounts/models.py | 16 +- appsettings/models.py | 12 +- appsettings/templates/appsettings.html | 12 +- appsettings/views.py | 4 +- computes/models.py | 12 +- computes/templates/computes.html | 20 +- computes/validators.py | 2 +- console/templates/console-spice-lite.html | 3 +- console/views.py | 2 +- create/models.py | 10 +- create/templates/create_instance_w1.html | 4 +- create/templates/create_instance_w2.html | 82 ++-- datasource/views.py | 6 +- dev/scss/wvc-main.scss | 6 +- instances/models.py | 8 +- instances/templates/instance.html | 4 +- instances/views.py | 60 +-- locale/de/LC_MESSAGES/django.po | 293 +++++------ locale/en/LC_MESSAGES/django.po | 428 ++++++++++------ locale/es/LC_MESSAGES/django.po | 313 ++++++------ locale/fr/LC_MESSAGES/django.po | 313 ++++++------ locale/nl/LC_MESSAGES/django.po | 293 +++++------ locale/ru/LC_MESSAGES/django.po | 428 ++++++++++------ locale/tr/LC_MESSAGES/django.mo | Bin 54934 -> 58345 bytes locale/tr/LC_MESSAGES/django.po | 574 +++++++++++++--------- locale/uk/LC_MESSAGES/django.po | 428 ++++++++++------ logs/models.py | 10 +- nwfilters/views.py | 2 +- storages/views.py | 6 +- 29 files changed, 1987 insertions(+), 1364 deletions(-) diff --git a/accounts/models.py b/accounts/models.py index 2510d7d..0f96879 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -19,8 +19,8 @@ class UserInstance(models.Model): class UserSSHKey(models.Model): user = models.ForeignKey(User, on_delete=models.DO_NOTHING) - keyname = models.CharField(max_length=25) - keypublic = models.CharField(max_length=500) + keyname = models.CharField(_('key name'), max_length=25) + keypublic = models.CharField(_('public key'), max_length=500) def __unicode__(self): return self.keyname @@ -29,24 +29,28 @@ class UserSSHKey(models.Model): class UserAttributes(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE) can_clone_instances = models.BooleanField(default=True) - max_instances = models.IntegerField(default=2, + max_instances = models.IntegerField(_('max instances'), + default=2, help_text=_("-1 for unlimited. Any integer value"), validators=[ MinValueValidator(-1), ]) max_cpus = models.IntegerField( + _('max CPUs'), default=2, - help_text="-1 for unlimited. Any integer value", + help_text=_("-1 for unlimited. Any integer value"), validators=[MinValueValidator(-1)], ) max_memory = models.IntegerField( + _('max memory'), default=2048, - help_text="-1 for unlimited. Any integer value", + help_text=_("-1 for unlimited. Any integer value"), validators=[MinValueValidator(-1)], ) max_disk_size = models.IntegerField( + _('max disk size'), default=20, - help_text="-1 for unlimited. Any integer value", + help_text=_("-1 for unlimited. Any integer value"), validators=[MinValueValidator(-1)], ) diff --git a/appsettings/models.py b/appsettings/models.py index ed1b73c..0e0393c 100644 --- a/appsettings/models.py +++ b/appsettings/models.py @@ -1,13 +1,13 @@ from django.db import models - +from django.utils.translation import ugettext_lazy as _ class AppSettings(models.Model): def choices_as_list(self): return self.choices.split(',') - name = models.CharField(max_length=25, null=False) - key = models.CharField(db_index=True, max_length=50, unique=True) - value = models.CharField(max_length=25) - choices = models.CharField(max_length=50) - description = models.CharField(max_length=100, null=True) + name = models.CharField(_('name'), max_length=25, null=False) + key = models.CharField(_('key'), db_index=True, max_length=50, unique=True) + value = models.CharField(_('value'), max_length=25) + choices = models.CharField(_('choices'), max_length=50) + description = models.CharField(_('description'), max_length=100, null=True) diff --git a/appsettings/templates/appsettings.html b/appsettings/templates/appsettings.html index f1942d4..e584136 100644 --- a/appsettings/templates/appsettings.html +++ b/appsettings/templates/appsettings.html @@ -37,9 +37,9 @@ {% if request.user.is_superuser %}
{% csrf_token %}
- +
- +
@@ -47,7 +47,7 @@
- {% for theme in themes_list %} {% endfor %} @@ -61,16 +61,16 @@ {% for setting in appsettings %}
{% csrf_token %}
- +
{% if setting.choices %} - {% for choice in setting.choices_as_list %} {% endfor %} {% else %} - + {% endif%}
diff --git a/appsettings/views.py b/appsettings/views.py index b2ab57c..0b95cf8 100644 --- a/appsettings/views.py +++ b/appsettings/views.py @@ -20,7 +20,7 @@ def appsettings(request): :return: """ error_messages = [] - + main_css = "wvc-main.min.css" sass_dir = AppSettings.objects.get(key="SASS_DIR") bootstrap_theme = AppSettings.objects.get(key="BOOTSTRAP_THEME") try: @@ -59,7 +59,7 @@ def appsettings(request): main.write(scss_var + "\n" + scss_boot + "\n" + scss_bootswatch + "\n") css_compressed = sass.compile(string=scss_var + "\n"+ scss_boot + "\n" + scss_bootswatch, output_style='compressed') - with open("static/" + "css/wvc-main.min.css", "w") as css: + with open("static/css/" + main_css, "w") as css: css.write(css_compressed) bootstrap_theme.value = theme diff --git a/computes/models.py b/computes/models.py index bda751b..c2ab052 100644 --- a/computes/models.py +++ b/computes/models.py @@ -1,12 +1,12 @@ from django.db.models import Model, CharField, IntegerField - +from django.utils.translation import ugettext_lazy as _ class Compute(Model): - name = CharField(max_length=64, unique=True) - hostname = CharField(max_length=64) - login = CharField(max_length=20) - password = CharField(max_length=14, blank=True, null=True) - details = CharField(max_length=64, null=True, blank=True) + name = CharField(_('name'), max_length=64, unique=True) + hostname = CharField(_('hostname'), max_length=64) + login = CharField(_('login'), max_length=20) + password = CharField(_('password'), max_length=14, blank=True, null=True) + details = CharField(_('details'), max_length=64, null=True, blank=True) type = IntegerField() def __unicode__(self): diff --git a/computes/templates/computes.html b/computes/templates/computes.html index ed7a568..3e7f98b 100644 --- a/computes/templates/computes.html +++ b/computes/templates/computes.html @@ -37,17 +37,17 @@
-
{% trans "Status" %}
+
{% trans "Status" %}
{% if compute.status %} -
{% trans "Connected" %}
+
{% trans "Connected" %}
{% else %} -
{% trans "Not Connected" %}
+
{% trans "Not Connected" %}
{% endif %} -
{% trans "Details" %}
+
{% trans "Details" %}
{% if compute.details %} -
{% trans compute.details %}
+
{% trans compute.details %}
{% else %} -
{% trans "No details available" %}
+
{% trans "No details available" %}
{% endif %}
@@ -63,7 +63,7 @@ {% csrf_token %}