groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-02-11 20:19:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge upstream/master and resolve translation conflict

Browse source 
Merged new Conrad info provider and generic web provider translations
from upstream while keeping Update Manager translations.
This commit is contained in:
Sebastian Almberg 2026-02-01 19:07:15 +01:00
commit 6b27f3aa14
22 changed files with 1787 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

16
templates/_navbar.html.twig
View file

@ -10,9 +10,9 @@
<!-- <span class="navbar-toggler-icon"></span> -->
<i class="fas fa-folder-open fa-lg fa-fw"></i>
</button>
{% if is_granted("@tools.label_scanner") %}
{% if is_granted("@tools.label_scanner") %}
<a href="{{ path('scan_dialog') }}" class="navbar-toggler nav-link ms-3">
<i class="fas fa-camera-retro fa-fw"></i>
<i class="fas fa-camera-retro fa-fw"></i>
</a>
{% endif %}
</div>
@ -52,6 +52,14 @@
{% trans %}info_providers.search.title{% endtrans %}
</a>
</li>
{% if settings_instance('generic_web_provider').enabled %}
<li>
<a class="dropdown-item" href="{{ path('info_providers_from_url') }}">
<i class="fa-fw fa-solid fa-book-atlas"></i>
{% trans %}info_providers.from_url.title{% endtrans %}
</a>
</li>
{% endif %}
{% endif %}
{% if is_granted('@parts.import') %}
@ -69,7 +77,7 @@
{% if is_granted('@parts.read') %}
{{ search.search_form("navbar") }}
{# {% include "_navbar_search.html.twig" %} #}
{# {% include "_navbar_search.html.twig" %} #}
{% endif %}
@ -158,4 +166,4 @@
</ul>
</div>
</div>
</nav>
</nav>