From 0814d1caf0c0f7ad23218801239e8e7f68dca1e2 Mon Sep 17 00:00:00 2001 From: Marcel Diegelmann Date: Wed, 1 Oct 2025 08:26:46 +0200 Subject: [PATCH] Korrekturen vornehmen --- config/services.yaml | 26 ------------ src/Controller/PartController.php | 1 - src/Entity/LogSystem/LogTargetType.php | 5 --- src/Entity/Parts/Part.php | 1 - src/Services/ElementTypeNameGenerator.php | 2 - src/Twig/DataSourceNameExtension.php | 42 ------------------- templates/admin/category_admin.html.twig | 6 +-- templates/admin/footprint_admin.html.twig | 6 +-- templates/admin/manufacturer_admin.html.twig | 6 +-- templates/admin/project_admin.html.twig | 6 +-- templates/admin/storelocation_admin.html.twig | 6 +-- templates/admin/supplier_admin.html.twig | 6 +-- templates/form/permission_layout.html.twig | 28 +------------ translations/messages.el.xlf | 12 ------ 14 files changed, 14 insertions(+), 139 deletions(-) delete mode 100644 src/Twig/DataSourceNameExtension.php diff --git a/config/services.yaml b/config/services.yaml index ed063b49..5491ce31 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -170,13 +170,6 @@ services: #################################################################################################################### # Table settings #################################################################################################################### - App\DataTables\AssemblyDataTable: - arguments: - $visible_columns: '%partdb.table.assemblies.default_columns%' - App\DataTables\AssemblyBomEntriesDataTable: - arguments: - $visible_columns: '%partdb.table.assemblies_bom.default_columns%' - App\DataTables\Helpers\ColumnSortHelper: shared: false # Service has a state so not share it between different tables @@ -197,25 +190,6 @@ services: $fontDirectory: '%kernel.project_dir%/var/dompdf/fonts/' $tmpDirectory: '%kernel.project_dir%/var/dompdf/tmp/' - #################################################################################################################### - # Trees - #################################################################################################################### - App\Services\Trees\TreeViewGenerator: - arguments: - $dataSourceSynonyms: '%partdb.data_sources.synonyms%' - App\Services\Trees\ToolsTreeBuilder: - arguments: - $dataSourceSynonyms: '%partdb.data_sources.synonyms%' - - #################################################################################################################### - # Twig Extensions - #################################################################################################################### - - App\Twig\DataSourceNameExtension: - arguments: - $dataSourceSynonyms: '%partdb.data_sources.synonyms%' - tags: [ 'twig.extension' ] - #################################################################################################################### # Part info provider system #################################################################################################################### diff --git a/src/Controller/PartController.php b/src/Controller/PartController.php index 69e9557e..29abfad8 100644 --- a/src/Controller/PartController.php +++ b/src/Controller/PartController.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace App\Controller; use App\DataTables\LogDataTable; -use App\Entity\AssemblySystem\Assembly; use App\Entity\Attachments\AttachmentUpload; use App\Entity\Parts\Category; use App\Entity\Parts\Footprint; diff --git a/src/Entity/LogSystem/LogTargetType.php b/src/Entity/LogSystem/LogTargetType.php index 29e65c3d..72efe6c7 100644 --- a/src/Entity/LogSystem/LogTargetType.php +++ b/src/Entity/LogSystem/LogTargetType.php @@ -22,8 +22,6 @@ declare(strict_types=1); */ namespace App\Entity\LogSystem; -use App\Entity\AssemblySystem\Assembly; -use App\Entity\AssemblySystem\AssemblyBOMEntry; use App\Entity\Attachments\Attachment; use App\Entity\Attachments\AttachmentType; use App\Entity\InfoProviderSystem\BulkInfoProviderImportJob; @@ -80,9 +78,6 @@ enum LogTargetType: int case ASSEMBLY_BOM_ENTRY = 24; case PART_CUSTOM_STATE = 25; - case ASSEMBLY = 23; - case ASSEMBLY_BOM_ENTRY = 24; - /** * Returns the class name of the target type or null if the target type is NONE. * @return string|null diff --git a/src/Entity/Parts/Part.php b/src/Entity/Parts/Part.php index e1836f9f..b0824fc8 100644 --- a/src/Entity/Parts/Part.php +++ b/src/Entity/Parts/Part.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace App\Entity\Parts; -use App\Entity\Parts\PartTraits\AssemblyTrait; use ApiPlatform\Doctrine\Common\Filter\DateFilterInterface; use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter; use ApiPlatform\Doctrine\Orm\Filter\DateFilter; diff --git a/src/Services/ElementTypeNameGenerator.php b/src/Services/ElementTypeNameGenerator.php index a378f5f0..9ef2a063 100644 --- a/src/Services/ElementTypeNameGenerator.php +++ b/src/Services/ElementTypeNameGenerator.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace App\Services; -use App\Entity\AssemblySystem\Assembly; -use App\Entity\AssemblySystem\AssemblyBOMEntry; use App\Entity\Attachments\Attachment; use App\Entity\Attachments\AttachmentContainingDBElement; use App\Entity\Attachments\AttachmentType; diff --git a/src/Twig/DataSourceNameExtension.php b/src/Twig/DataSourceNameExtension.php deleted file mode 100644 index 1c02243f..00000000 --- a/src/Twig/DataSourceNameExtension.php +++ /dev/null @@ -1,42 +0,0 @@ -translator = $translator; - $this->dataSourceSynonyms = $dataSourceSynonyms ?? []; - } - - public function getFunctions(): array - { - return [ - new TwigFunction('get_data_source_name', [$this, 'getDataSourceName']), - ]; - } - - /** - * Based on the locale and data source names, gives the right synonym value back or the default translator value. - */ - public function getDataSourceName(string $dataSourceName, string $defaultKey): string - { - $locale = $this->translator->getLocale(); - - // Use alternative dataSource synonym (if available) - if (isset($this->dataSourceSynonyms[$dataSourceName][$locale])) { - return $this->dataSourceSynonyms[$dataSourceName][$locale]; - } - - // Otherwise return the standard translation - return $this->translator->trans($defaultKey); - } -} \ No newline at end of file diff --git a/templates/admin/category_admin.html.twig b/templates/admin/category_admin.html.twig index 82089a28..f77188c7 100644 --- a/templates/admin/category_admin.html.twig +++ b/templates/admin/category_admin.html.twig @@ -1,9 +1,7 @@ {% extends "admin/base_admin.html.twig" %} {% block card_title %} - {% set dataSourceName = get_data_source_name('category', 'category.labelp') %} - {% set translatedSource = 'category.labelp'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}category.labelp{% endtrans %} {% endblock %} {% block additional_pills %} @@ -63,4 +61,4 @@ {{ form_row(form.eda_info.kicad_symbol) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/footprint_admin.html.twig b/templates/admin/footprint_admin.html.twig index a6acbe84..bdbf83cb 100644 --- a/templates/admin/footprint_admin.html.twig +++ b/templates/admin/footprint_admin.html.twig @@ -1,9 +1,7 @@ {% extends "admin/base_admin.html.twig" %} {% block card_title %} - {% set dataSourceName = get_data_source_name('footprint', 'footprint.labelp') %} - {% set translatedSource = 'footprint.labelp'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}footprint.labelp{% endtrans %} {% endblock %} {% block master_picture_block %} @@ -36,4 +34,4 @@ {{ form_row(form.eda_info.kicad_footprint) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/manufacturer_admin.html.twig b/templates/admin/manufacturer_admin.html.twig index 3ce9a124..8555d5e4 100644 --- a/templates/admin/manufacturer_admin.html.twig +++ b/templates/admin/manufacturer_admin.html.twig @@ -1,9 +1,7 @@ {% extends "admin/base_company_admin.html.twig" %} {% block card_title %} - {% set dataSourceName = get_data_source_name('manufacturer', 'manufacturer.caption') %} - {% set translatedSource = 'manufacturer.caption'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}manufacturer.caption{% endtrans %} {% endblock %} {% block edit_title %} @@ -12,4 +10,4 @@ {% block new_title %} {% trans %}manufacturer.new{% endtrans %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/project_admin.html.twig b/templates/admin/project_admin.html.twig index 401be7cf..e12e58ae 100644 --- a/templates/admin/project_admin.html.twig +++ b/templates/admin/project_admin.html.twig @@ -3,9 +3,7 @@ {# @var entity App\Entity\ProjectSystem\Project #} {% block card_title %} - {% set dataSourceName = get_data_source_name('project', 'project.caption') %} - {% set translatedSource = 'project.caption'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}project.caption{% endtrans %} {% endblock %} {% block edit_title %} @@ -61,4 +59,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/storelocation_admin.html.twig b/templates/admin/storelocation_admin.html.twig index 1e60eeea..706538f2 100644 --- a/templates/admin/storelocation_admin.html.twig +++ b/templates/admin/storelocation_admin.html.twig @@ -2,9 +2,7 @@ {% import "label_system/dropdown_macro.html.twig" as dropdown %} {% block card_title %} - {% set dataSourceName = get_data_source_name('storagelocation', 'storelocation.labelp') %} - {% set translatedSource = 'storelocation.labelp'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}storelocation.labelp{% endtrans %} {% endblock %} {% block additional_controls %} @@ -40,4 +38,4 @@ {% block new_title %} {% trans %}storelocation.new{% endtrans %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/admin/supplier_admin.html.twig b/templates/admin/supplier_admin.html.twig index b5cf7b23..598f4c27 100644 --- a/templates/admin/supplier_admin.html.twig +++ b/templates/admin/supplier_admin.html.twig @@ -1,9 +1,7 @@ {% extends "admin/base_company_admin.html.twig" %} {% block card_title %} - {% set dataSourceName = get_data_source_name('supplier', 'supplier.caption') %} - {% set translatedSource = 'supplier.caption'|trans %} - {% if dataSourceName != translatedSource %}{{ 'datasource.synonym'|trans({'%name%': translatedSource, '%synonym%': dataSourceName}) }}{% else %}{{ translatedSource }}{% endif %} + {% trans %}supplier.caption{% endtrans %} {% endblock %} {% block additional_panes %} @@ -21,4 +19,4 @@ {% block new_title %} {% trans %}supplier.new{% endtrans %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/form/permission_layout.html.twig b/templates/form/permission_layout.html.twig index 95353a1b..45525d02 100644 --- a/templates/form/permission_layout.html.twig +++ b/templates/form/permission_layout.html.twig @@ -6,36 +6,12 @@
{% else %} - def{{ form.vars.label | trans }} + {{ form.vars.label | trans }} {% endif %} diff --git a/translations/messages.el.xlf b/translations/messages.el.xlf index 355c4316..faaa9dac 100644 --- a/translations/messages.el.xlf +++ b/translations/messages.el.xlf @@ -2542,12 +2542,6 @@ Μη έγκυρη κανονική έκφραση (regex) - - - datasource.synonym - %name% (Το συνώνυμό σας: %synonym%) - - category.edit.part_ipn_prefix @@ -3657,11 +3651,5 @@ Επεξεργασία - - - datasource.synonym - %name% (Το συνώνυμό σας: %synonym%) - -