Mascali
/
netbox
mirror of https://github.com/netbox-community/netbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Closes #14141: translation cleanup (#14143) 

* Translations cleanup

* Tweak variable names; misc string cleanup

* Misc cleanup
This commit is contained in:
Jeremy Stretch 2023-10-30 13:38:03 -04:00 committed by GitHub
parent 30ce9edf1c
commit c4e765c4a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 12408 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/circuits/filtersets.py
View File

@ -154,12 +154,12 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte
provider_account_id = django_filters.ModelMultipleChoiceFilter(
field_name='provider_account',
queryset=ProviderAccount.objects.all(),
label=_('ProviderAccount (ID)'),
label=_('Provider account (ID)'),
)
provider_network_id = django_filters.ModelMultipleChoiceFilter(
field_name='terminations__provider_network',
queryset=ProviderNetwork.objects.all(),
label=_('ProviderNetwork (ID)'),
label=_('Provider network (ID)'),
)
type_id = django_filters.ModelMultipleChoiceFilter(
queryset=CircuitType.objects.all(),

2
netbox/circuits/forms/filtersets.py
View File

@ -88,7 +88,7 @@ class ProviderNetworkFilterForm(NetBoxModelFilterSetForm):
label=_('Provider')
)
service_id = forms.CharField(
label=_('Service id'),
label=_('Service ID'),
max_length=100,
required=False
)

8
netbox/dcim/choices.py
View File

@ -80,10 +80,10 @@ class RackWidthChoices(ChoiceSet):
WIDTH_23IN = 23
CHOICES = (
(WIDTH_10IN, _('10 inches')),
(WIDTH_19IN, _('19 inches')),
(WIDTH_21IN, _('21 inches')),
(WIDTH_23IN, _('23 inches')),
(WIDTH_10IN, _('{n} inches').format(n=10)),
(WIDTH_19IN, _('{n} inches').format(n=19)),
(WIDTH_21IN, _('{n} inches').format(n=21)),
(WIDTH_23IN, _('{n} inches').format(n=23)),
)

12
netbox/dcim/forms/common.py
View File

@ -116,17 +116,17 @@ class ModuleCommonForm(forms.Form):
# It is not possible to adopt components already belonging to a module
if adopt_components and existing_item and existing_item.module:
raise forms.ValidationError(
_("Cannot adopt {name} '{resolved_name}' as it already belongs to a module").format(
name=template.component_model.__name__,
resolved_name=resolved_name
_("Cannot adopt {model} {name} as it already belongs to a module").format(
model=template.component_model.__name__,
name=resolved_name
)
)
# If we are not adopting components we error if the component exists
if not adopt_components and resolved_name in installed_components:
raise forms.ValidationError(
_("{name} - {resolved_name} already exists").format(
name=template.component_model.__name__,
resolved_name=resolved_name
_("A {model} named {name} already exists").format(
model=template.component_model.__name__,
name=resolved_name
)
)

8
netbox/dcim/models/device_component_templates.py
View File

@ -534,14 +534,16 @@ class FrontPortTemplate(ModularComponentTemplateModel):
# Validate rear port assignment
if self.rear_port.device_type != self.device_type:
raise ValidationError(
_("Rear port ({}) must belong to the same device type").format(self.rear_port)
_("Rear port ({name}) must belong to the same device type").format(name=self.rear_port)
)
# Validate rear port position assignment
if self.rear_port_position > self.rear_port.positions:
raise ValidationError(
_("Invalid rear port position ({}); rear port {} has only {} positions").format(
self.rear_port_position, self.rear_port.name, self.rear_port.positions
_("Invalid rear port position ({position}); rear port {name} has only {count} positions").format(
position=self.rear_port_position,
name=self.rear_port.name,
count=self.rear_port.positions
)
)

30
netbox/dcim/models/devices.py
View File

@ -302,8 +302,10 @@ class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin):
)
if d.position not in u_available:
raise ValidationError({
'u_height': _("Device {} in rack {} does not have sufficient space to accommodate a height of "
"{}U").format(d, d.rack, self.u_height)
'u_height': _(
"Device {device} in rack {rack} does not have sufficient space to accommodate a "
"height of {height}U"
).format(device=d, rack=d.rack, height=self.u_height)
})
# If modifying the height of an existing DeviceType to 0U, check for any instances assigned to a rack position.
@ -920,7 +922,7 @@ class Device(
if self.primary_ip4:
if self.primary_ip4.family != 4:
raise ValidationError({
'primary_ip4': _("{primary_ip4} is not an IPv4 address.").format(primary_ip4=self.primary_ip4)
'primary_ip4': _("{ip} is not an IPv4 address.").format(ip=self.primary_ip4)
})
if self.primary_ip4.assigned_object in vc_interfaces:
pass
@ -929,13 +931,13 @@ class Device(
else:
raise ValidationError({
'primary_ip4': _(
"The specified IP address ({primary_ip4}) is not assigned to this device."
).format(primary_ip4=self.primary_ip4)
"The specified IP address ({ip}) is not assigned to this device."
).format(ip=self.primary_ip4)
})
if self.primary_ip6:
if self.primary_ip6.family != 6:
raise ValidationError({
'primary_ip6': _("{primary_ip6} is not an IPv6 address.").format(primary_ip6=self.primary_ip6m)
'primary_ip6': _("{ip} is not an IPv6 address.").format(ip=self.primary_ip6)
})
if self.primary_ip6.assigned_object in vc_interfaces:
pass
@ -944,8 +946,8 @@ class Device(
else:
raise ValidationError({
'primary_ip6': _(
"The specified IP address ({primary_ip6}) is not assigned to this device."
).format(primary_ip6=self.primary_ip6)
"The specified IP address ({ip}) is not assigned to this device."
).format(ip=self.primary_ip6)
})
if self.oob_ip:
if self.oob_ip.assigned_object in vc_interfaces:
@ -963,17 +965,19 @@ class Device(
raise ValidationError({
'platform': _(
"The assigned platform is limited to {platform_manufacturer} device types, but this device's "
"type belongs to {device_type_manufacturer}."
"type belongs to {devicetype_manufacturer}."
).format(
platform_manufacturer=self.platform.manufacturer,
device_type_manufacturer=self.device_type.manufacturer
devicetype_manufacturer=self.device_type.manufacturer
)
})
# A Device can only be assigned to a Cluster in the same Site (or no Site)
if self.cluster and self.cluster.site is not None and self.cluster.site != self.site:
raise ValidationError({
'cluster': _("The assigned cluster belongs to a different site ({})").format(self.cluster.site)
'cluster': _("The assigned cluster belongs to a different site ({site})").format(
site=self.cluster.site
)
})
# Validate virtual chassis assignment
@ -1445,8 +1449,8 @@ class VirtualDeviceContext(PrimaryModel):
if primary_ip.family != family:
raise ValidationError({
f'primary_ip{family}': _(
"{primary_ip} is not an IPv{family} address."
).format(family=family, primary_ip=primary_ip)
"{ip} is not an IPv{family} address."
).format(family=family, ip=primary_ip)
})
device_interfaces = self.device.vc_interfaces(if_master=False)
if primary_ip.assigned_object not in device_interfaces:

10
netbox/dcim/models/racks.py
View File

@ -562,9 +562,9 @@ class RackReservation(PrimaryModel):
invalid_units = [u for u in self.units if u not in self.rack.units]
if invalid_units:
raise ValidationError({
'units': _("Invalid unit(s) for {}U rack: {}").format(
self.rack.u_height,
', '.join([str(u) for u in invalid_units]),
'units': _("Invalid unit(s) for {height}U rack: {unit_list}").format(
height=self.rack.u_height,
unit_list=', '.join([str(u) for u in invalid_units])
),
})
@ -575,8 +575,8 @@ class RackReservation(PrimaryModel):
conflicting_units = [u for u in self.units if u in reserved_units]
if conflicting_units:
raise ValidationError({
'units': _('The following units have already been reserved: {}').format(
', '.join([str(u) for u in conflicting_units]),
'units': _('The following units have already been reserved: {unit_list}').format(
unit_list=', '.join([str(u) for u in conflicting_units])
)
})

8
netbox/extras/models/customfields.py
View File

@ -287,8 +287,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
except ValidationError as err:
raise ValidationError({
'default': _(
'Invalid default value "{default}": {message}'
).format(default=self.default, message=err.message)
'Invalid default value "{value}": {error}'
).format(value=self.default, error=err.message)
})
# Minimum/maximum values can be set only for numeric fields
@ -332,8 +332,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
elif self.object_type:
raise ValidationError({
'object_type': _(
"{type_display} fields may not define an object type.")
.format(type_display=self.get_type_display())
"{type} fields may not define an object type.")
.format(type=self.get_type_display())
})
def serialize(self, value):

6
netbox/ipam/forms/model_forms.py
View File

@ -372,14 +372,14 @@ class IPAddressForm(TenancyForm, NetBoxModelForm):
# Do not allow assigning a network ID or broadcast address to an interface.
if interface and (address := self.cleaned_data.get('address')):
if address.ip == address.network:
msg = _("{address} is a network ID, which may not be assigned to an interface.").format(address=address)
msg = _("{ip} is a network ID, which may not be assigned to an interface.").format(ip=address.ip)
if address.version == 4 and address.prefixlen not in (31, 32):
raise ValidationError(msg)
if address.version == 6 and address.prefixlen not in (127, 128):
raise ValidationError(msg)
if address.version == 4 and address.ip == address.broadcast and address.prefixlen not in (31, 32):
msg = _("{address} is a broadcast address, which may not be assigned to an interface.").format(
address=address
msg = _("{ip} is a broadcast address, which may not be assigned to an interface.").format(
ip=address.ip
)
raise ValidationError(msg)

28
netbox/ipam/models/ip.py
View File

@ -140,8 +140,11 @@ class Aggregate(GetAvailablePrefixesMixin, PrimaryModel):
if covering_aggregates:
raise ValidationError({
'prefix': _(
"Aggregates cannot overlap. {} is already covered by an existing aggregate ({})."
).format(self.prefix, covering_aggregates[0])
"Aggregates cannot overlap. {prefix} is already covered by an existing aggregate ({aggregate})."
).format(
prefix=self.prefix,
aggregate=covering_aggregates[0]
)
})
# Ensure that the aggregate being added does not cover an existing aggregate
@ -150,8 +153,11 @@ class Aggregate(GetAvailablePrefixesMixin, PrimaryModel):
covered_aggregates = covered_aggregates.exclude(pk=self.pk)
if covered_aggregates:
raise ValidationError({
'prefix': _("Aggregates cannot overlap. {} covers an existing aggregate ({}).").format(
self.prefix, covered_aggregates[0]
'prefix': _(
"Prefixes cannot overlap aggregates. {prefix} covers an existing aggregate ({aggregate})."
).format(
prefix=self.prefix,
aggregate=covered_aggregates[0]
)
})
@ -314,10 +320,11 @@ class Prefix(GetAvailablePrefixesMixin, PrimaryModel):
if (self.vrf is None and get_config().ENFORCE_GLOBAL_UNIQUE) or (self.vrf and self.vrf.enforce_unique):
duplicate_prefixes = self.get_duplicates()
if duplicate_prefixes:
table = _("VRF {vrf}").format(vrf=self.vrf) if self.vrf else _("global table")
raise ValidationError({
'prefix': _("Duplicate prefix found in {}: {}").format(
_("VRF {}").format(self.vrf) if self.vrf else _("global table"),
duplicate_prefixes.first(),
'prefix': _("Duplicate prefix found in {table}: {prefix}").format(
table=table,
prefix=duplicate_prefixes.first(),
)
})
@ -843,10 +850,11 @@ class IPAddress(PrimaryModel):
self.role not in IPADDRESS_ROLES_NONUNIQUE or
any(dip.role not in IPADDRESS_ROLES_NONUNIQUE for dip in duplicate_ips)
):
table = _("VRF {vrf}").format(vrf=self.vrf) if self.vrf else _("global table")
raise ValidationError({
'address': _("Duplicate IP address found in {}: {}").format(
_("VRF {}").format(self.vrf) if self.vrf else _("global table"),
duplicate_ips.first(),
'address': _("Duplicate IP address found in {table}: {ipaddress}").format(
table=table,
ipaddress=duplicate_ips.first(),
)
})

4
netbox/ipam/models/vlans.py
View File

@ -234,8 +234,8 @@ class VLAN(PrimaryModel):
if self.group and not self.group.min_vid <= self.vid <= self.group.max_vid:
raise ValidationError({
'vid': _(
"VID must be between {min_vid} and {max_vid} for VLANs in group {group}"
).format(min_vid=self.group.min_vid, max_vid=self.group.max_vid, group=self.group)
"VID must be between {minimum} and {maximum} for VLANs in group {group}"
).format(minimum=self.group.min_vid, maximum=self.group.max_vid, group=self.group)
})
def get_status_color(self):

2
netbox/netbox/navigation/menu.py
View File

@ -1,4 +1,4 @@
from django.utils.translation import gettext as _
from django.utils.translation import gettext_lazy as _
from netbox.registry import registry
from utilities.choices import ButtonColorChoices

4
netbox/templates/dcim/devicebay_delete.html
View File

@ -8,8 +8,8 @@
{% block message %}
<p>
{% blocktrans trimmed %}
Are you sure you want to delete this device bay from <strong>{{ devicebay.device }}</strong>?
{% blocktrans trimmed with device=devicebay.device %}
Are you sure you want to delete this device bay from <strong>{{ device }}</strong>?
{% endblocktrans %}
</p>
{% endblock %}

12322
netbox/translations/en/LC_MESSAGES/django.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
netbox/users/forms/model_forms.py
View File

@ -386,5 +386,5 @@ class ObjectPermissionForm(BootstrapMixin, forms.ModelForm):
model.objects.filter(qs_filter_from_constraints(constraints, tokens)).exists()
except FieldError as e:
raise forms.ValidationError({
'constraints': _('Invalid filter for {model}: {e}').format(model=model, e=e)
'constraints': _('Invalid filter for {model}: {error}').format(model=model, error=e)
})

2
netbox/users/models.py
View File

@ -169,7 +169,7 @@ class UserConfig(models.Model):
elif key in d:
err_path = '.'.join(path.split('.')[:i + 1])
raise TypeError(
_("Key '{err_path}' is a leaf node; cannot assign new keys").format(err_path=err_path)
_("Key '{path}' is a leaf node; cannot assign new keys").format(path=err_path)
)
else:
d = d.setdefault(key, {})

8
netbox/virtualization/forms/model_forms.py
View File

@ -151,8 +151,12 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
for device in self.cleaned_data.get('devices', []):
if device.site != self.cluster.site:
raise ValidationError({
'devices': _("{} belongs to a different site ({}) than the cluster ({})").format(
device, device.site, self.cluster.site
'devices': _(
"{device} belongs to a different site ({device_site}) than the cluster ({cluster_site})"
).format(
device=device,
device_site=device.site,
cluster_site=self.cluster.site
)
})

9
netbox/virtualization/models/clusters.py
View File

@ -135,10 +135,9 @@ class Cluster(ContactsMixin, PrimaryModel):
# If the Cluster is assigned to a Site, verify that all host Devices belong to that Site.
if self.pk and self.site:
nonsite_devices = Device.objects.filter(cluster=self).exclude(site=self.site).count()
if nonsite_devices:
if nonsite_devices := Device.objects.filter(cluster=self).exclude(site=self.site).count():
raise ValidationError({
'site': _("{} devices are assigned as hosts for this cluster but are not in site {}").format(
nonsite_devices, self.site
)
'site': _(
"{count} devices are assigned as hosts for this cluster but are not in site {site}"
).format(count=nonsite_devices, site=self.site)
})

8
netbox/wireless/models.py
View File

@ -213,14 +213,14 @@ class WirelessLink(WirelessAuthenticationBase, PrimaryModel):
if self.interface_a.type not in WIRELESS_IFACE_TYPES:
raise ValidationError({
'interface_a': _(
"{type_display} is not a wireless interface."
).format(type_display=self.interface_a.get_type_display())
"{type} is not a wireless interface."
).format(type=self.interface_a.get_type_display())
})
if self.interface_b.type not in WIRELESS_IFACE_TYPES:
raise ValidationError({
'interface_a': _(
"{type_display} is not a wireless interface."
).format(type_display=self.interface_b.get_type_display())
"{type} is not a wireless interface."
).format(type=self.interface_b.get_type_display())
})
def save(self, *args, **kwargs):