Commit 1f3f0684 by Kálmán Viktor

network: makemessages compatibility

parent 0d92152b
# -*- coding: utf8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
from firewall.models import (Rule, Host, Vlan, Group, VlanGroup, Firewall, from firewall.models import (Rule, Host, Vlan, Group, VlanGroup, Firewall,
......
# -*- coding: utf8 -*- # -*- coding: utf-8 -*-
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models from django.db import models
...@@ -467,8 +467,9 @@ class Host(models.Model): ...@@ -467,8 +467,9 @@ class Host(models.Model):
assert proto in ('tcp', 'udp', ) assert proto in ('tcp', 'udp', )
if public: if public:
if public in self._get_ports_used(proto): if public in self._get_ports_used(proto):
raise ValidationError(_("Port %s %s is already in use.") % raise ValidationError(
(proto, public)) _("Port %(proto)s %(public)s is already in use.") %
{'proto': proto, 'public': public})
else: else:
public = self._get_random_port(proto) public = self._get_random_port(proto)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment