Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/ClassificationStore/Service/SearchHelperService.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use Pimcore\Model\DataObject\Classificationstore\KeyConfig\Dao as KeyConfigDao;
use Pimcore\Model\DataObject\Classificationstore\KeyConfig\Listing as KeyConfigListing;
use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation\Listing as KeyGroupRelationListing;
use Pimcore\Model\Translation;

/**
* @internal
Expand Down Expand Up @@ -85,8 +84,7 @@ public function getTranslatedSearchFilterTerms(string $searchTerm): array

$translatedSearchKeys = $this->translationRepository->getTranslationKeysWithTextFilter(
$searchTerm,
$user->getLanguage(),
Translation::DOMAIN_ADMIN
$user->getLanguage()
);

$searchTerms = array_merge([$searchTerm], $translatedSearchKeys);
Expand Down
8 changes: 4 additions & 4 deletions src/DataObject/Legacy/PreviewGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
use Pimcore\Bundle\StaticResolverBundle\Lib\ToolResolverInterface;
use Pimcore\Bundle\StaticResolverBundle\Models\Site\SiteResolverInterface;
use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface;
use Pimcore\Model\DataObject\ClassDefinition\LinkGeneratorInterface;
use Pimcore\Model\DataObject\ClassDefinition\PreviewGeneratorInterface;
use Pimcore\Model\DataObject\Concrete;
use Pimcore\Model\Site\Listing;
use Pimcore\Model\Translation;
use Symfony\Contracts\Translation\TranslatorInterface;
use function array_key_exists;
use function in_array;
Expand Down Expand Up @@ -119,7 +119,7 @@ private function getLocalePreviewConfig(): array

return [
'name' => PreviewGeneratorInterface::PARAMETER_LOCALE,
'label' => $this->translator->trans('preview_generator_locale', [], Translation::DOMAIN_ADMIN),
'label' => $this->translator->trans('preview_generator_locale', [], TranslatorServiceInterface::DOMAIN),
'values' => $locales,
'defaultValue' => $defaultValue,
];
Expand All @@ -135,7 +135,7 @@ protected function getSitePreviewConfig(): array
}

$sitesOptions = [
$this->translator->trans('main_site', [], Translation::DOMAIN_ADMIN) => '0',
$this->translator->trans('main_site', [], TranslatorServiceInterface::DOMAIN) => '0',
];

$preSelectedSite = null;
Expand All @@ -160,7 +160,7 @@ protected function getSitePreviewConfig(): array

return [
'name' => PreviewGeneratorInterface::PARAMETER_SITE,
'label' => $this->translator->trans('preview_generator_site', [], Translation::DOMAIN_ADMIN),
'label' => $this->translator->trans('preview_generator_site', [], TranslatorServiceInterface::DOMAIN),
'values' => $sitesOptions,
'defaultValue' => $preSelectedSite ?: reset($sitesOptions),
];
Expand Down
8 changes: 3 additions & 5 deletions src/Translation/Service/TranslatorService.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\CreateTranslation;
use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation;
use Pimcore\Bundle\StudioBackendBundle\Util\Constant\PublicTranslations;
use Pimcore\Config;
use Pimcore\Model\Exception\NotFoundException;
use Pimcore\Model\Translation as TranslationModel;
use Pimcore\Model\Translation\Listing;
use Pimcore\Translation\Translator;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
Expand All @@ -53,6 +53,7 @@
private TranslatorBagInterface $translatorBag;

public function __construct(
private Config $config,
private TranslatorInterface $translator,
private TranslationRepositoryInterface $translationRepository,
private SecurityServiceInterface $securityService,
Expand Down Expand Up @@ -150,12 +151,9 @@ public function translateApiDocs(string $message, string $locale = 'en'): string

public function getAvailableDomains(): array
{
$translation = new TranslationModel();

$domains = $translation->getDao()->getAvailableDomains();
$domains = array_values(array_unique($this->config['translations']['domains'] ?? []));

$availableDomains = [];

foreach ($domains as $domain) {
$availableDomains[] = [
'domain' => $domain,
Expand Down
2 changes: 2 additions & 0 deletions tests/Unit/Service/Translator/TranslatorServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorService;
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface;
use Pimcore\Bundle\StudioBackendBundle\Util\Constant\PublicTranslations;
use Pimcore\Config;
use Pimcore\Translation\Translator;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use function count;
Expand Down Expand Up @@ -93,6 +94,7 @@ private function mockTranslatorService(bool $loggedIn = true): TranslatorService
$toolResolver = $this->makeEmpty(ToolResolverInterface::class);

return new TranslatorService(
new Config(),
$translator,
$repository,
$securityService,
Expand Down
3 changes: 3 additions & 0 deletions translations/studio.de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Objektbaustein-Import
studio_ee_job_step_bulk_import_cleanup: Massenimport-Bereinigung
studio_ee_bulk_import_failed: 'Massenimport von %type% „%name%" fehlgeschlagen: %message%'
studio_ee_job_element_usage_replace: Elementverwendung ersetzen
preview_generator_locale: Sprache
main_site: Hauptseite
preview_generator_site: Seite
5 changes: 4 additions & 1 deletion translations/studio.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,7 @@ studio_ee_job_step_custom_layout_importing: Custom Layout Importing
studio_ee_job_step_object_brick_importing: Object Brick Importing
studio_ee_job_step_bulk_import_cleanup: Bulk Import Cleanup
studio_ee_bulk_import_failed: 'Bulk import of %type% "%name%" failed: %message%'
studio_ee_job_element_usage_replace: Element Usage Replace
studio_ee_job_element_usage_replace: Element Usage Replace
preview_generator_locale: Language
main_site: 'Main Site'
preview_generator_site: Site
3 changes: 3 additions & 0 deletions translations/studio.es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Importación de bloques de objetos
studio_ee_job_step_bulk_import_cleanup: Limpieza de la importación masiva
studio_ee_bulk_import_failed: 'La importación masiva de %type% «%name%» falló: %message%'
studio_ee_job_element_usage_replace: Reemplazar uso del elemento
preview_generator_locale: Idioma
main_site: Sitio Principal
preview_generator_site: Web
3 changes: 3 additions & 0 deletions translations/studio.fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Import des briques d'objets
studio_ee_job_step_bulk_import_cleanup: Nettoyage de l'import en masse
studio_ee_bulk_import_failed: "L'import en masse de %type% « %name% » a échoué : %message%"
studio_ee_job_element_usage_replace: Remplacer l'utilisation de l'élément
preview_generator_locale: Language
main_site: Site principal
preview_generator_site: Site
3 changes: 3 additions & 0 deletions translations/studio.it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Importazione dei mattoni oggetto
studio_ee_job_step_bulk_import_cleanup: Pulizia dell'importazione in blocco
studio_ee_bulk_import_failed: "L'importazione in blocco di %type% «%name%» non è riuscita: %message%"
studio_ee_job_element_usage_replace: Sostituisci utilizzo dell'elemento
preview_generator_locale: Language
main_site: Sito principale
preview_generator_site: Site
3 changes: 3 additions & 0 deletions translations/studio.no.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Import av objektblokker
studio_ee_job_step_bulk_import_cleanup: Opprydding av masseimport
studio_ee_bulk_import_failed: 'Masseimport av %type% «%name%» mislyktes: %message%'
studio_ee_job_element_usage_replace: Erstatt elementbruk
preview_generator_locale: Language
main_site: 'Main Site'
preview_generator_site: Site
3 changes: 3 additions & 0 deletions translations/studio.sv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Import av objektblock
studio_ee_job_step_bulk_import_cleanup: Rensning av massimport
studio_ee_bulk_import_failed: 'Massimport av %type% "%name%" misslyckades: %message%'
studio_ee_job_element_usage_replace: Ersätt elementanvändning
preview_generator_locale: Language
main_site: Huvudsajt
preview_generator_site: Site
Loading