Misc cleanup

This commit is contained in:
Jeremy Stretch 2023-07-28 14:18:30 -04:00
parent 3501ca0e7e
commit 79526c7c9d
34 changed files with 53 additions and 53 deletions

View File

@ -25,7 +25,7 @@
/>
{# Page title #}
<title>{% block title %}{% trans "Home" %}{% endblock %} | {% trans "NetBox" %}</title>
<title>{% block title %}{% trans "Home" %}{% endblock %} | NetBox</title>
<script
type="text/javascript"

View File

@ -67,13 +67,13 @@
</div>
<div class="col col-md-6">
<div class="card">
<h5 class="card-header">{% trans "Termination A" %}</h5>
<h5 class="card-header">{% trans "Termination" %} A</h5>
<div class="card-body">
{% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %}
</div>
</div>
<div class="card">
<h5 class="card-header">{% trans "Termination B" %}</h5>
<h5 class="card-header">{% trans "Termination" %} B</h5>
<div class="card-body">
{% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %}
</div>

View File

@ -83,7 +83,7 @@
<td>{{ object.get_mode_display|placeholder }}</td>
</tr>
<tr>
<th scope="row">{% trans "Transmit power (dBm" %})</th>
<th scope="row">{% trans "Transmit power (dBm)" %}</th>
<td>{{ object.tx_power|placeholder }}</td>
</tr>
</table>

View File

@ -83,11 +83,11 @@
</tr>
<tr>
<th scope="row">{% trans "Voltage" %}</th>
<td>{{ object.voltage }}{% trans "V" %}</td>
<td>{{ object.voltage }}V</td>
</tr>
<tr>
<th scope="row">{% trans "Amperage" %}</th>
<td>{{ object.amperage }}{% trans "A" %}</td>
<td>{{ object.amperage }}A</td>
</tr>
<tr>
<th scope="row">{% trans "Phase" %}</th>

View File

@ -24,7 +24,7 @@
</div>
<div class="dropdown">
<button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-sort"></i>&nbsp;{% blocktranslate %}Sort By {{ sort_display_name }}{% endblocktranslate %}
<i class="mdi mdi-sort"></i> {% trans "Sort By" %} {{ sort_display_name }}
</button>
<ul class="dropdown-menu dropdown-menu-end">
{% for sort_key, sort_display_name in sort_choices.items %}

View File

@ -65,11 +65,11 @@
<div class="card-body">
<table class="table table-hover attr-table">
<tr>
<th scope="row">{% trans "IPAM enforce global unique" %}:</th>
<th scope="row">{% trans "Enforce global unique" %}:</th>
<td>{{ object.data.ENFORCE_GLOBAL_UNIQUE }}</td>
</tr>
<tr>
<th scope="row">{% trans "IPAM prefer IPV4" %}:</th>
<th scope="row">{% trans "Prefer IPv4" %}:</th>
<td>{{ object.data.PREFER_IPV4 }}</td>
</tr>
</table>

View File

@ -4,6 +4,6 @@
{% block title %}{% trans "Reset Dashboard" %}?{% endblock %}
{% block message %}
<p>{% trans "This will remove" %} <strong>{% trans "all" %}</strong> {% trans "configured widgets and restore the default dashboard configuration" %}.</p>
<p>{% trans "This change affects on" %} <i>{% trans "your" %}</i> {% trans "dashboard, and will not impact other users" %}.</p>
<p>{% blocktrans %}This will remove <strong>all</strong> configured widgets and restore the default dashboard configuration.{% endblocktrans %}</p>
<p>{% blocktrans %}This change affects only <i>your</i> dashboard, and will not impact other users.{% endblocktrans %}</p>
{% endblock %}

View File

@ -43,7 +43,7 @@
</div>
{% if execution_time %}
<div class="card-footer text-end text-muted">
<small>{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }}{% trans "s" %}</small>
<small>{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }} {% trans "seconds" context "Unit of time" %}</small>
</div>
{% endif %}
</div>

View File

@ -1,7 +1,6 @@
{% load i18n %}
<div class="float-end">
<div class="btn-group btn-group-sm" role="group">
<a href="?format=json" type="button" class="btn btn-outline-dark{% if format == 'json' %} active{% endif %}">{% trans "JSON" %}</a>
<a href="?format=yaml" type="button" class="btn btn-outline-dark{% if format == 'yaml' %} active{% endif %}">{% trans "YAML" %}</a>
<a href="?format=json" type="button" class="btn btn-outline-dark{% if format == 'json' %} active{% endif %}">JSON</a>
<a href="?format=yaml" type="button" class="btn btn-outline-dark{% if format == 'yaml' %} active{% endif %}">YAML</a>
</div>
</div>

View File

@ -153,7 +153,7 @@
{% include 'inc/panel_table.html' with table=related_changes_table heading='Related Changes' panel_class='default' %}
{% if related_changes_count > related_changes_table.rows|length %}
<div class="float-end">
<a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">{% blocktranslate %}See All {{ related_changes_count|add:"1" }} Changes{% endblocktranslate %}</a>
<a href="{% url 'extras:objectchange_list' %}?request_id={{ object.request_id }}" class="btn btn-primary">{% blocktrans with count=related_changes_count|add:"1" %}See All {{ count }} Changes{% endblocktrans %}</a>
</div>
{% endif %}
</div>

View File

@ -21,8 +21,11 @@ Context:
<div class="alert alert-danger mb-3" role="alert">
<h4 class="alert-heading">{% trans "Confirm Bulk Deletion" %}</h4>
<hr />
<strong>{% trans "Warning" %}:</strong> {% trans "The following operation will delete" %} <strong>{{ table.rows|length }}</strong>
{{ model|meta:"verbose_name_plural" }}. {% trans "Please carefully review the objects to be deleted and confirm below" %}.
<strong>{% trans "Warning" context "Noun" %}:</strong>
{% blocktrans with count=table.rows|length type_plural=model|meta:"verbose_name_plural" %}
The following operation will delete <strong>{{ count }}</strong> {{ type_plural }}. Please
carefully review the objects to be deleted and confirm below.
{% endblocktrans %}
{% block message_extra %}{% endblock %}
</div>
</div>
@ -37,7 +40,7 @@ Context:
{{ field }}
{% endfor %}
<div class="text-end">
<button type="submit" name="_confirm" class="btn btn-danger">{% blocktranslate %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}{% endblocktranslate %}</button>
<button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}</button>
<a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
</div>
</form>

View File

@ -188,12 +188,12 @@ Context:
</div>
</div>
<p class="small text-muted">
<i class="mdi mdi-check-bold text-success"></i> {% trans "Required fields" %} <strong>{% trans "must" %}</strong> {% trans "be specified for all
objects" %}.
<i class="mdi mdi-check-bold text-success"></i>
{% blocktrans %}Required fields <strong>must</strong> be specified for all objects.{% endblocktrans %}
</p>
<p class="small text-muted">
<i class="mdi mdi-information-outline"></i> {% trans "Related objects may be referenced by any unique attribute.
For example" %}, <code>{% trans "vrf.rd" %}</code> {% trans "would identify a VRF by its route distinguisher" %}.
<i class="mdi mdi-information-outline"></i>
{% blocktrans with example="vrf.rd" %}Related objects may be referenced by any unique attribute. For example, <code>{{ example }}</code> would identify a VRF by its route distinguisher.{% endblocktrans %}
</p>
{% endif %}

View File

@ -16,7 +16,7 @@
{% block message %}<p>{% trans "Are you sure" %}?</p>{% endblock %}
</div>
<div class="card-footer text-end">
<button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"{% trans "danger" %}" }}">{% trans "Confirm" %}</button>
<button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"danger" }}">{% trans "Confirm" %}</button>
<a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
</div>
</div>

View File

@ -1,4 +1,3 @@
{% load i18n %}
{% comment %}
This template derives from the graphene-django project:
https://github.com/graphql-python/graphene-django/blob/main/graphene_django/templates/graphene/graphiql.html
@ -24,7 +23,7 @@ add "&raw" to the end of the URL within a browser.
</style>
<link href="{% static 'graphiql.css'%}" rel="stylesheet" />
<link rel="icon" type="image/png" href="{% static 'graphql.ico' %}" />
<title>{% trans "GraphiQL | NetBox" %}</title>
<title>GraphiQL | NetBox</title>
</head>
<body>
<div id="editor"></div>

View File

@ -11,10 +11,10 @@
<h6 class="alert-heading">
<i class="mdi mdi-information-outline"></i><br/>{% trans "New Release Available" %}
</h6>
<small><a href="{{ new_release.url }}">{% trans "NetBox v" %}{{ new_release.version }}</a> {% trans "is available" %}.</small>
<small><a href="{{ new_release.url }}">NetBox v{{ new_release.version }}</a> {% trans "is available" %}.</small>
<hr class="my-2" />
<small class="mb-0">
<a href="https://docs.netbox.dev/en/stable/installation/upgrading/">{% trans "Upgrade Instructions" %}</a>
<a href="https://docs.netbox.dev/en/stable/installation/upgrading/">{% trans "Upgrade Instructions" context "Document title" %}</a>
</small>
</div>
</div>

View File

@ -7,7 +7,7 @@
<h5 class="modal-title">{% trans "Confirm Deletion" %}</h5>
</div>
<div class="modal-body">
<p>{% trans "Are you sure you want to" %} <strong class="text-danger">{% trans "delete" %}</strong> {{ object_type }} <strong>{{ object }}</strong>?</p>
<p>{% blocktrans %}Are you sure you want to <strong class="text-danger">delete</strong> {{ object_type }} <strong>{{ object }}</strong>?{% endblocktrans %}</p>
{% render_form form %}
</div>
<div class="modal-footer">

View File

@ -46,7 +46,7 @@
{% endif %}
</div>
<div class="card-footer text-end noprint border-0">
<button type="button" class="btn btn-sm btn-outline-danger m-1" {% trans "data-reset-select" %}>
<button type="button" class="btn btn-sm btn-outline-danger m-1" data-reset-select>
<i class="mdi mdi-backspace"></i> {% trans "Reset" %}
</button>
<button type="submit" class="btn btn-sm btn-primary m-1">

View File

@ -1,5 +1,4 @@
{% load helpers %}
{% load i18n %}
<div id="django-messages" class="toast-container">

View File

@ -4,7 +4,7 @@
<div class="row mb-3">
<div class="col-auto table-controls noprint">
<div class="input-group input-group-sm me-2 quicksearch hide-last-child">
<input type="search" {% trans "results=5" %} name="q" id="quicksearch" class="form-control" placeholder="Quick search"
<input type="search" results="5" name="q" id="quicksearch" class="form-control" placeholder="Quick search"
hx-get="{{ request.full_path }}" hx-target="#object_list" hx-trigger="keyup changed delay:500ms, search" />
<button class="btn bg-transparent" type="button" id="quicksearch_clear"><i class="mdi mdi-close-circle"></i></button>
</div>

View File

@ -13,7 +13,7 @@
<table class="table table-hover attr-table">
<tr>
<td>{% trans "Family" %}</td>
<td>{% trans "IPv" %}{{ object.family }}</td>
<td>IPv{{ object.family }}</td>
</tr>
<tr>
<td>{% trans "RIR" %}</td>

View File

@ -15,7 +15,7 @@
<table class="table table-hover attr-table">
<tr>
<th scope="row">{% trans "Family" %}</th>
<td>{% trans "IPv" %}{{ object.family }}</td>
<td>IPv{{ object.family }}</td>
</tr>
<tr>
<th scope="row">{% trans "VRF" %}</th>
@ -72,7 +72,7 @@
</td>
</tr>
<tr>
<th scope="row">{% trans "NAT (inside" %})</th>
<th scope="row">{% trans "NAT (inside)" %}</th>
<td>
{% if object.nat_inside %}
{{ object.nat_inside|linkify }}
@ -85,7 +85,7 @@
</td>
</tr>
<tr>
<th scope="row">{% trans "NAT (Outside" %})</th>
<th scope="row">{% trans "NAT (outside)" %}</th>
<td>
{% for ip in object.nat_outside.all %}
{{ ip|linkify }}

View File

@ -14,7 +14,7 @@
<table class="table table-hover attr-table">
<tr>
<th scope="row">{% trans "Family" %}</th>
<td>{% trans "IPv" %}{{ object.family }}</td>
<td>IPv{{ object.family }}</td>
</tr>
<tr>
<th scope="row">{% trans "Starting Address" %}</th>

View File

@ -13,7 +13,7 @@
<table class="table table-hover attr-table">
<tr>
<th scope="row">{% trans "Family" %}</th>
<td>{% trans "IPv" %}{{ object.family }}</td>
<td>IPv{{ object.family }}</td>
</tr>
<tr>
<th scope="row">{% trans "VRF" %}</th>

View File

@ -34,7 +34,7 @@
</div>
{% render_field form.name %}
<div class="row">
<label class="col-sm-3 col-form-label text-lg-end">{% trans "Port(s" %})</label>
<label class="col-sm-3 col-form-label text-lg-end">{% trans "Port(s)" %}</label>
<div class="col-3">
{{ form.protocol }}
</div>

View File

@ -72,7 +72,7 @@
<div class="col-1 col-md-auto mb-0"></div>
<div class="col text-end mb-0">
<small class="text-muted">
{{ settings.HOSTNAME }} ({% trans "v" %}{{ settings.VERSION }})
{{ settings.HOSTNAME }} (v{{ settings.VERSION }})
</small>
</div>
</div>

View File

@ -7,8 +7,8 @@
<link rel="icon" type="image/png" href="{% static 'rest-api.ico' %}" />
{% endblock head %}
{% block title %}{% if name %}{{ name }} | {% endif %}{% trans "NetBox REST API" %}{% endblock %}
{% block title %}{% if name %}{{ name }} | {% endif %}NetBox {% trans "REST API" %}{% endblock %}
{% block branding %}
<a class="navbar-brand" href="{% url 'home' %}">{% trans "NetBox" %}</a>
<a class="navbar-brand" href="{% url 'home' %}">NetBox</a>
{% endblock branding %}

View File

@ -61,7 +61,7 @@
{% for table, prefs in request.user.config.data.tables.items %}
<tr>
<td>
<input type="checkbox" name="pk" value="{% trans "tables" %}.{{ table }}" class="form-check-input" />
<input type="checkbox" name="pk" value="tables.{{ table }}" class="form-check-input" />
</td>
<td>{{ table }}</td>
<td>{{ prefs.ordering|join:", "|placeholder }}</td>

View File

@ -74,7 +74,7 @@
<th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}</th>
<td>
{% if disk_sum %}
{{ disk_sum }} {% trans "GB" %}
{{ disk_sum }} {% trans "GB" context "Abbreviation for gigabyte" %}
{% else %}
{{ ''|placeholder }}
{% endif %}

View File

@ -138,7 +138,7 @@
<th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}</th>
<td>
{% if object.disk %}
{{ object.disk }} {% trans "GB" %}
{{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
{% else %}
{{ ''|placeholder }}
{% endif %}

View File

@ -32,7 +32,7 @@
<th scope="row">{% trans "Channel Frequency" %}</th>
<td>
{% if interface.rf_channel_frequency %}
{{ interface.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %}
{{ interface.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" context "Abbreviation for megahertz" %}
{% else %}
{{ ''|placeholder }}
{% endif %}
@ -42,7 +42,7 @@
<th scope="row">{% trans "Channel Width" %}</th>
<td>
{% if interface.rf_channel_width %}
{{ interface.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %}
{{ interface.rf_channel_width|floatformat:"-3" }} {% trans "MHz" context "Abbreviation for megahertz" %}
{% else %}
{{ ''|placeholder }}
{% endif %}

View File

@ -7,7 +7,7 @@
<div class="row">
<div class="col col-md-6">
<div class="card">
<h5 class="card-header">{% trans "Interface A" %}</h5>
<h5 class="card-header">{% trans "Interface" %} A</h5>
<div class="card-body">
{% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_a %}
</div>
@ -46,7 +46,7 @@
</div>
<div class="col col-md-6">
<div class="card">
<h5 class="card-header">{% trans "Interface B" %}</h5>
<h5 class="card-header">{% trans "Interface" %} B</h5>
<div class="card-body">
{% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_b %}
</div>

View File

@ -36,8 +36,8 @@
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-outline-danger" id="reset_tableconfig" value="{% trans "Reset" %}">{% trans "Reset" %}</button>
<button type="submit" class="btn btn-primary" id="save_tableconfig" value="{% trans "Save" %}">{% trans "Save" %}</button>
<button type="submit" class="btn btn-outline-danger" id="reset_tableconfig" value="Reset">{% trans "Reset" %}</button>
<button type="submit" class="btn btn-primary" id="save_tableconfig" value="Save">{% trans "Save" %}</button>
</div>
</form>
</div>

View File

@ -19,7 +19,7 @@
name="{{ widget.name }}"
id="id_{{ widget.name }}"
accept="{{ widget.attrs.accept }}"
{% if widget.required %}{% trans "required" %}{% endif %}
{% if widget.required %}required{% endif %}
/>
</div>
</div>