diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index ca9c9e5..fe28b1a 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -1005,3 +1005,10 @@ msgstr "Может пинговать" msgid "Can view additional telephones" msgstr "Может видеть дополнительные телефоны" + + +#: abonapp/views.py:694 +#, python-format +msgid "IP Conflict! %d/%d results" +msgstr "IP Конфликт! ping %d из %d" + diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index 6a22bb8..33fcde0 100644 --- a/abonapp/templates/abonapp/group_list.html +++ b/abonapp/templates/abonapp/group_list.html @@ -60,17 +60,17 @@ {% if perms.abonapp.add_abongroup %} - {% trans 'Add group' %} + {% endif %} {% if perms.abonapp.can_view_abonlog %} - {% trans 'Subscribers actions' %} + {% endif %} {% if perms.abonapp.can_view_invoiceforpayment %} - {% trans 'List of debtors' %} + {% endif %} diff --git a/abonapp/views.py b/abonapp/views.py index 31745e3..9c14a34 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -689,12 +689,14 @@ def abon_ping(request): else: if type(ping_result) is tuple: loses_percent = (ping_result[0] / ping_result[1] if ping_result[1] != 0 else 1) - if loses_percent > 0.5: + print(ping_result, loses_percent) + if loses_percent > 1.0: + text = ' %s' % _('IP Conflict! %d/%d results') % ping_result + elif loses_percent > 0.5: text = ' %s' % _('ok ping, %d/%d loses') % ping_result status = True else: - text = ' %s' % _( - 'no ping, %d/%d loses') % ping_result + text = ' %s' % _('no ping, %d/%d loses') % ping_result else: text = ' %s' % _('ping ok') + ' ' + str(ping_result) status = True diff --git a/devapp/locale/ru/LC_MESSAGES/django.po b/devapp/locale/ru/LC_MESSAGES/django.po index 77cfd06..fc826ad 100644 --- a/devapp/locale/ru/LC_MESSAGES/django.po +++ b/devapp/locale/ru/LC_MESSAGES/django.po @@ -309,3 +309,7 @@ msgstr "Устройство" msgid "Can toggle ports" msgstr "Может переключать порты" + +msgid "Plugin output" +msgstr "Вывод мониторинга" + diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index b97f411..c903d7e 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -16,27 +16,27 @@ # - + {% trans 'Ip address' %} {% if order_by == 'ip_address' %}{% endif %} - + {% trans 'Comment' %} {% if order_by == 'comment' %}{% endif %} - {% trans 'Mac address' %} - {% trans 'Plugin output' %} - + {% trans 'Mac address' %} + {% trans 'Plugin output' %} + {% trans 'Device type' %} {% if order_by == 'devtype' %}{% endif %} - Do + Do diff --git a/djing/urls.py b/djing/urls.py index 541c4c5..6e92ef3 100644 --- a/djing/urls.py +++ b/djing/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url, include +from django.conf import settings -from . import settings from .views import home diff --git a/taskapp/templates/taskapp/ext.htm b/taskapp/templates/taskapp/ext.htm index 73d5198..04412ba 100644 --- a/taskapp/templates/taskapp/ext.htm +++ b/taskapp/templates/taskapp/ext.htm @@ -14,7 +14,7 @@

{% trans 'Tasks to be performed' %}

-