From 234d9947c3b8c1fbf5263f43cc5614e28cdd857d Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 23 Aug 2018 12:32:33 +0300 Subject: [PATCH] Merge branch 'devel' into multiple_nas # Conflicts: # statistics/migrations/0003_auto_20180814_1921.py --- nas_app/locale/ru/LC_MESSAGES/django.po | 8 -------- nas_app/models.py | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nas_app/locale/ru/LC_MESSAGES/django.po b/nas_app/locale/ru/LC_MESSAGES/django.po index 616be01..ec2485a 100644 --- a/nas_app/locale/ru/LC_MESSAGES/django.po +++ b/nas_app/locale/ru/LC_MESSAGES/django.po @@ -36,14 +36,6 @@ msgstr "IP адрес" msgid "Port" msgstr "Порт" -#: models.py:15 -msgid "Login" -msgstr "Логин" - -#: models.py:16 -msgid "Password" -msgstr "Пароль" - #: models.py:17 msgid "Type" msgstr "Тип" diff --git a/nas_app/models.py b/nas_app/models.py index e5af6d7..b0db96d 100644 --- a/nas_app/models.py +++ b/nas_app/models.py @@ -12,8 +12,8 @@ class NASModel(models.Model): title = models.CharField(_('Title'), max_length=127, unique=True) ip_address = models.GenericIPAddressField(_('Ip address'), unique=True) ip_port = models.PositiveSmallIntegerField(_('Port')) - auth_login = models.CharField(_('Login'), max_length=64) - auth_passw = models.CharField(_('Password'), max_length=127) + auth_login = models.CharField(_('Auth login'), max_length=64) + auth_passw = models.CharField(_('Auth password'), max_length=127) nas_type = models.CharField(_('Type'), max_length=4, choices=MyChoicesAdapter(NAS_TYPES), default=NAS_TYPES[0][0]) default = models.BooleanField(_('Is default'), default=False)