Merge pull request #20810 from netbox-community/20766-fix-german-translation-code-literals

Fixes #20766: Prevent translation of code/commands in error templates
This commit is contained in:
bctiemann 2025-11-19 19:07:12 -05:00 committed by GitHub
commit 8ac7f6f8de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions

View File

@ -8,10 +8,10 @@
<p> <p>
<i class="mdi mdi-alert"></i> <i class="mdi mdi-alert"></i>
<strong>{% trans "Missing required packages" %}.</strong> <strong>{% trans "Missing required packages" %}.</strong>
{% blocktrans trimmed %} {% blocktrans trimmed with req_file="requirements.txt" local_req_file="local_requirements.txt" pip_cmd="pip freeze" %}
This installation of NetBox might be missing one or more required Python packages. These packages are listed in This installation of NetBox might be missing one or more required Python packages. These packages are listed in
<code>requirements.txt</code> and <code>local_requirements.txt</code>, and are normally installed as part of the <code>{{ req_file }}</code> and <code>{{ local_req_file }}</code>, and are normally installed as part of the
installation or upgrade process. To verify installed packages, run <code>pip freeze</code> from the console and installation or upgrade process. To verify installed packages, run <code>{{ pip_cmd }}</code> from the console and
compare the output to the list of required packages. compare the output to the list of required packages.
{% endblocktrans %} {% endblocktrans %}
</p> </p>

View File

@ -8,17 +8,17 @@
<p> <p>
<i class="mdi mdi-alert"></i> <i class="mdi mdi-alert"></i>
<strong>{% trans "Database migrations missing" %}.</strong> <strong>{% trans "Database migrations missing" %}.</strong>
{% blocktrans trimmed %} {% blocktrans trimmed with command="python3 manage.py migrate" %}
When upgrading to a new NetBox release, the upgrade script must be run to apply any new database migrations. You When upgrading to a new NetBox release, the upgrade script must be run to apply any new database migrations. You
can run migrations manually by executing <code>python3 manage.py migrate</code> from the command line. can run migrations manually by executing <code>{{ command }}</code> from the command line.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
<p> <p>
<i class="mdi mdi-alert"></i> <i class="mdi mdi-alert"></i>
<strong>{% trans "Unsupported PostgreSQL version" %}.</strong> <strong>{% trans "Unsupported PostgreSQL version" %}.</strong>
{% blocktrans trimmed %} {% blocktrans trimmed with sql_query="SELECT VERSION()" %}
Ensure that PostgreSQL version 14 or later is in use. You can check this by connecting to the database using Ensure that PostgreSQL version 14 or later is in use. You can check this by connecting to the database using
NetBox's credentials and issuing a query for <code>SELECT VERSION()</code>. NetBox's credentials and issuing a query for <code>{{ sql_query }}</code>.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
{% endblock message %} {% endblock message %}

View File

@ -26,8 +26,8 @@
<p>{% trans "Check the following" %}:</p> <p>{% trans "Check the following" %}:</p>
<ul> <ul>
<li class="tip"> <li class="tip">
{% blocktrans trimmed %} {% blocktrans trimmed with command="manage.py collectstatic" %}
<code>manage.py collectstatic</code> was run during the most recent upgrade. This installs the most <code>{{ command }}</code> was run during the most recent upgrade. This installs the most
recent iteration of each static file into the static root path. recent iteration of each static file into the static root path.
{% endblocktrans %} {% endblocktrans %}
</li> </li>