Reworked settings name and translation

src/Services/ElementTypeNameGenerator.php

@@ -34,7 +34,7 @@ use App\Entity\PriceInformations\Pricedetail;
 use App\Entity\ProjectSystem\Project;
 use App\Entity\ProjectSystem\ProjectBOMEntry;
 use App\Exceptions\EntityNotSupportedException;
-use App\Settings\SystemSettings\DataSourceSynonymsSettings;
+use App\Settings\SynonymSettings;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -46,7 +46,7 @@ final readonly class ElementTypeNameGenerator
     public function __construct(
         private TranslatorInterface $translator,
         private EntityURLGenerator $entityURLGenerator,
-        private DataSourceSynonymsSettings $synonymsSettings,
+        private SynonymSettings $synonymsSettings,
     )
     {
     }

src/Services/Trees/TreeViewGenerator.php

@@ -38,7 +38,6 @@ use App\Services\Cache\ElementCacheTagGenerator;
 use App\Services\Cache\UserCacheKeyGenerator;
 use App\Services\ElementTypeNameGenerator;
 use App\Services\EntityURLGenerator;
-use App\Services\Misc\DataSourceSynonymResolver;
 use App\Settings\BehaviorSettings\SidebarSettings;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
@@ -68,7 +67,6 @@ class TreeViewGenerator
         protected TranslatorInterface $translator,
         private readonly UrlGeneratorInterface $router,
         private readonly SidebarSettings $sidebarSettings,
-        protected readonly DataSourceSynonymResolver $synonymResolver,
         private readonly ElementTypeNameGenerator $elementTypeNameGenerator
     ) {
         $this->rootNodeEnabled = $this->sidebarSettings->rootNodeEnabled;

src/Settings/AppSettings.php

@@ -47,6 +47,12 @@ class AppSettings
     #[EmbeddedSettings()]
     public ?InfoProviderSettings $infoProviders = null;
 
+    #[EmbeddedSettings]
+    public ?SynonymSettings $synonyms = null;
+
     #[EmbeddedSettings()]
     public ?MiscSettings $miscSettings = null;
+
+
+
 }

src/Settings/SynonymSettings.php

@@ -20,30 +20,28 @@
 
 declare(strict_types=1);
 
-namespace App\Settings\SystemSettings;
+namespace App\Settings;
 
 use App\Form\Type\DataSourceSynonymsCollectionType;
 use App\Services\ElementTypes;
-use App\Settings\SettingsIcon;
 use Jbtronics\SettingsBundle\ParameterTypes\ArrayType;
 use Jbtronics\SettingsBundle\ParameterTypes\SerializeType;
-use Jbtronics\SettingsBundle\ParameterTypes\StringType;
 use Jbtronics\SettingsBundle\Settings\Settings;
 use Jbtronics\SettingsBundle\Settings\SettingsParameter;
 use Jbtronics\SettingsBundle\Settings\SettingsTrait;
 use Symfony\Component\Translation\TranslatableMessage as TM;
 use Symfony\Component\Validator\Constraints as Assert;
 
-#[Settings(label: new TM("settings.system.data_source_synonyms"))]
+#[Settings(label: new TM("settings.system.synonyms"), description: "settings.system.synonyms.help")]
 #[SettingsIcon("fa-language")]
-class DataSourceSynonymsSettings
+class SynonymSettings
 {
     use SettingsTrait;
 
     #[SettingsParameter(
         ArrayType::class,
-        label: new TM("settings.system.data_source_synonyms.configuration"),
-        description: new TM("settings.system.data_source_synonyms.configuration.help"),
+        label: new TM("settings.system.synonyms.type_synonyms"),
+        description: new TM("settings.system.synonyms.type_synonyms.help"),
         options: ['type' => SerializeType::class],
         formType: DataSourceSynonymsCollectionType::class,
         formOptions: [
@@ -53,7 +51,7 @@ class DataSourceSynonymsSettings
     #[Assert\Type('array')]
     #[Assert\All([new Assert\Type('array')])]
     /**
-     * @var array<string, array<string, array{singular: string, plural: string}>> $customTypeLabels
+     * @var array<string, array<string, array{singular: string, plural: string}>> $typeSynonyms
      * An array of the form: [
      * 'category' => [
      *    'en' => ['singular' => 'Category', 'plural' => 'Categories'],
@@ -64,7 +62,7 @@ class DataSourceSynonymsSettings
      *   ],
      * ]
      */
-    public array $customTypeLabels = [];
+    public array $typeSynonyms = [];
 
     /**
      * Checks if there is any synonym defined for the given type (no matter which language).
@@ -73,7 +71,7 @@ class DataSourceSynonymsSettings
      */
     public function isSynonymDefinedForType(ElementTypes $type): bool
     {
-        return isset($this->customTypeLabels[$type->value]);
+        return isset($this->typeSynonyms[$type->value]);
     }
 
     /**
@@ -84,7 +82,7 @@ class DataSourceSynonymsSettings
      */
     public function getSingularSynonymForType(ElementTypes $type, string $locale): ?string
     {
-        return $this->customTypeLabels[$type->value][$locale]['singular'] ?? null;
+        return $this->typeSynonyms[$type->value][$locale]['singular'] ?? null;
     }
 
     /**
@@ -95,8 +93,8 @@ class DataSourceSynonymsSettings
      */
     public function getPluralSynonymForType(ElementTypes $type, ?string $locale): ?string
     {
-        return $this->customTypeLabels[$type->value][$locale]['plural']
-            ?? $this->customTypeLabels[$type->value][$locale]['singular']
+        return $this->typeSynonyms[$type->value][$locale]['plural']
+            ?? $this->typeSynonyms[$type->value][$locale]['singular']
             ?? null;
     }
 }

src/Settings/SystemSettings/SystemSettings.php

@@ -33,8 +33,7 @@ class SystemSettings
     #[EmbeddedSettings()]
     public ?LocalizationSettings $localization = null;
 
-    #[EmbeddedSettings]
-    public ?DataSourceSynonymsSettings $dataSourceSynonyms = null;
+
 
     #[EmbeddedSettings()]
     public ?CustomizationSettings $customization = null;