Skip to content

Commit 012cb1c

Browse files
lukmziglukmzig
committed
Merge branch '2026.1' into 2026.x
2 parents d5a70ca + 6e14450 commit 012cb1c

12 files changed

Lines changed: 35 additions & 16 deletions

File tree

‎src/ClassificationStore/Service/SearchHelperService.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
use Pimcore\Model\DataObject\Classificationstore\KeyConfig\Dao as KeyConfigDao;
2323
use Pimcore\Model\DataObject\Classificationstore\KeyConfig\Listing as KeyConfigListing;
2424
use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation\Listing as KeyGroupRelationListing;
25-
use Pimcore\Model\Translation;
2625

2726
/**
2827
* @internal
@@ -85,8 +84,7 @@ public function getTranslatedSearchFilterTerms(string $searchTerm): array
8584

8685
$translatedSearchKeys = $this->translationRepository->getTranslationKeysWithTextFilter(
8786
$searchTerm,
88-
$user->getLanguage(),
89-
Translation::DOMAIN_ADMIN
87+
$user->getLanguage()
9088
);
9189

9290
$searchTerms = array_merge([$searchTerm], $translatedSearchKeys);

‎src/DataObject/Legacy/PreviewGenerator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
use Pimcore\Bundle\StaticResolverBundle\Lib\ToolResolverInterface;
2020
use Pimcore\Bundle\StaticResolverBundle\Models\Site\SiteResolverInterface;
2121
use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
22+
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface;
2223
use Pimcore\Model\DataObject\ClassDefinition\LinkGeneratorInterface;
2324
use Pimcore\Model\DataObject\ClassDefinition\PreviewGeneratorInterface;
2425
use Pimcore\Model\DataObject\Concrete;
2526
use Pimcore\Model\Site\Listing;
26-
use Pimcore\Model\Translation;
2727
use Symfony\Contracts\Translation\TranslatorInterface;
2828
use function array_key_exists;
2929
use function in_array;
@@ -119,7 +119,7 @@ private function getLocalePreviewConfig(): array
119119

120120
return [
121121
'name' => PreviewGeneratorInterface::PARAMETER_LOCALE,
122-
'label' => $this->translator->trans('preview_generator_locale', [], Translation::DOMAIN_ADMIN),
122+
'label' => $this->translator->trans('preview_generator_locale', [], TranslatorServiceInterface::DOMAIN),
123123
'values' => $locales,
124124
'defaultValue' => $defaultValue,
125125
];
@@ -135,7 +135,7 @@ protected function getSitePreviewConfig(): array
135135
}
136136

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

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

161161
return [
162162
'name' => PreviewGeneratorInterface::PARAMETER_SITE,
163-
'label' => $this->translator->trans('preview_generator_site', [], Translation::DOMAIN_ADMIN),
163+
'label' => $this->translator->trans('preview_generator_site', [], TranslatorServiceInterface::DOMAIN),
164164
'values' => $sitesOptions,
165165
'defaultValue' => $preSelectedSite ?: reset($sitesOptions),
166166
];

‎src/Translation/Attribute/Response/DomainList.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public function __construct()
3434
title: 'Domain',
3535
description: 'The domain name.',
3636
type: 'string',
37-
example: 'admin'
37+
example: 'studio'
3838
),
3939
new Property(
4040
'isFrontendDomain',
4141
title: 'Is Frontend Domain',
42-
description: 'If the domain is a frontend or admin domain.',
42+
description: 'If the domain is a frontend or main domain.',
4343
type: 'boolean',
4444
example: false
4545
),

‎src/Translation/Service/TranslatorService.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\CreateTranslation;
3434
use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation;
3535
use Pimcore\Bundle\StudioBackendBundle\Util\Constant\PublicTranslations;
36+
use Pimcore\Config;
3637
use Pimcore\Model\Exception\NotFoundException;
37-
use Pimcore\Model\Translation as TranslationModel;
3838
use Pimcore\Model\Translation\Listing;
3939
use Pimcore\Translation\Translator;
4040
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -53,6 +53,7 @@
5353
private TranslatorBagInterface $translatorBag;
5454

5555
public function __construct(
56+
private Config $config,
5657
private TranslatorInterface $translator,
5758
private TranslationRepositoryInterface $translationRepository,
5859
private SecurityServiceInterface $securityService,
@@ -150,16 +151,13 @@ public function translateApiDocs(string $message, string $locale = 'en'): string
150151

151152
public function getAvailableDomains(): array
152153
{
153-
$translation = new TranslationModel();
154-
155-
$domains = $translation->getDao()->getAvailableDomains();
154+
$domains = array_values(array_unique($this->config['translations']['domains'] ?? []));
156155

157156
$availableDomains = [];
158-
159157
foreach ($domains as $domain) {
160158
$availableDomains[] = [
161159
'domain' => $domain,
162-
'isFrontendDomain' => $domain !== 'studio' && $domain !== 'admin',
160+
'isFrontendDomain' => $domain !== 'studio',
163161
];
164162
}
165163

‎tests/Unit/Service/Translator/TranslatorServiceTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorService;
2727
use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface;
2828
use Pimcore\Bundle\StudioBackendBundle\Util\Constant\PublicTranslations;
29+
use Pimcore\Config;
2930
use Pimcore\Translation\Translator;
3031
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
3132
use function count;
@@ -93,6 +94,7 @@ private function mockTranslatorService(bool $loggedIn = true): TranslatorService
9394
$toolResolver = $this->makeEmpty(ToolResolverInterface::class);
9495

9596
return new TranslatorService(
97+
new Config(),
9698
$translator,
9799
$repository,
98100
$securityService,

‎translations/studio.de.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Objektbaustein-Import
7171
studio_ee_job_step_bulk_import_cleanup: Massenimport-Bereinigung
7272
studio_ee_bulk_import_failed: 'Massenimport von %type% „%name%" fehlgeschlagen: %message%'
7373
studio_ee_job_element_usage_replace: Elementverwendung ersetzen
74+
preview_generator_locale: Sprache
75+
main_site: Hauptseite
76+
preview_generator_site: Seite

‎translations/studio.en.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,7 @@ studio_ee_job_step_custom_layout_importing: Custom Layout Importing
7070
studio_ee_job_step_object_brick_importing: Object Brick Importing
7171
studio_ee_job_step_bulk_import_cleanup: Bulk Import Cleanup
7272
studio_ee_bulk_import_failed: 'Bulk import of %type% "%name%" failed: %message%'
73-
studio_ee_job_element_usage_replace: Element Usage Replace
73+
studio_ee_job_element_usage_replace: Element Usage Replace
74+
preview_generator_locale: Language
75+
main_site: 'Main Site'
76+
preview_generator_site: Site

‎translations/studio.es.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Importación de bloques de objetos
7171
studio_ee_job_step_bulk_import_cleanup: Limpieza de la importación masiva
7272
studio_ee_bulk_import_failed: 'La importación masiva de %type% «%name%» falló: %message%'
7373
studio_ee_job_element_usage_replace: Reemplazar uso del elemento
74+
preview_generator_locale: Idioma
75+
main_site: Sitio Principal
76+
preview_generator_site: Web

‎translations/studio.fr.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Import des briques d'objets
7171
studio_ee_job_step_bulk_import_cleanup: Nettoyage de l'import en masse
7272
studio_ee_bulk_import_failed: "L'import en masse de %type% « %name% » a échoué : %message%"
7373
studio_ee_job_element_usage_replace: Remplacer l'utilisation de l'élément
74+
preview_generator_locale: Language
75+
main_site: Site principal
76+
preview_generator_site: Site

‎translations/studio.it.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ studio_ee_job_step_object_brick_importing: Importazione dei mattoni oggetto
7171
studio_ee_job_step_bulk_import_cleanup: Pulizia dell'importazione in blocco
7272
studio_ee_bulk_import_failed: "L'importazione in blocco di %type% «%name%» non è riuscita: %message%"
7373
studio_ee_job_element_usage_replace: Sostituisci utilizzo dell'elemento
74+
preview_generator_locale: Language
75+
main_site: Sito principale
76+
preview_generator_site: Site

0 commit comments

Comments
 (0)