Skip to content

Commit

Permalink
Merge 4.x into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Feb 9, 2022
2 parents 5905a6e + 7d64ba4 commit 5606d31
Show file tree
Hide file tree
Showing 22 changed files with 109 additions and 24 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [4.0.1](https://github.com/sonata-project/SonataMediaBundle/compare/4.0.0...4.0.1) - 2022-02-08
### Fixed
- [[#2273](https://github.com/sonata-project/SonataMediaBundle/pull/2273)] Fixed admin media translations ([@jordisala1991](https://github.com/jordisala1991))
- [[#2273](https://github.com/sonata-project/SonataMediaBundle/pull/2273)] Fixed admin gallery translations ([@jordisala1991](https://github.com/jordisala1991))

## [4.0.0](https://github.com/sonata-project/SonataMediaBundle/compare/4.0.0-RC2...4.0.0) - 2022-01-25
### Added
- [[#2222](https://github.com/sonata-project/SonataMediaBundle/pull/2222)] Added support for Symfony 6. ([@jordisala1991](https://github.com/jordisala1991))
Expand Down
8 changes: 4 additions & 4 deletions src/Admin/GalleryAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ protected function alterNewInstance(object $object): void
protected function configureFormFields(FormMapper $form): void
{
$form
->with('form_group.gallery', ['class' => 'col-md-9'])->end()
->with('form_group.options', ['class' => 'col-md-3'])->end();
->with('gallery', ['class' => 'col-md-9'])->end()
->with('options', ['class' => 'col-md-3'])->end();

$context = $this->getPersistentParameter('context', $this->pool->getDefaultContext());

Expand All @@ -91,7 +91,7 @@ protected function configureFormFields(FormMapper $form): void
}

$form
->with('form_group.options')
->with('options')
->add('context', ChoiceType::class, [
'choices' => $contexts,
'choice_translation_domain' => 'SonataMediaBundle',
Expand All @@ -102,7 +102,7 @@ protected function configureFormFields(FormMapper $form): void
->add('defaultFormat', ChoiceType::class, ['choices' => $formats])
->ifEnd()
->end()
->with('form_group.gallery')
->with('gallery')
->add('galleryItems', CollectionType::class, ['by_reference' => false], [
'edit' => 'inline',
'inline' => 'table',
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.bg.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<source>filter.label_provider_name</source>
<target>Име на източника</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Медиа</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Активен</target>
Expand Down
12 changes: 8 additions & 4 deletions src/Resources/translations/SonataMediaBundle.ca.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -530,12 +530,16 @@
<source>form.label_class</source>
<target>Classe css</target>
</trans-unit>
<trans-unit id="form_group.gallery">
<source>form_group.gallery</source>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.group_gallery">
<source>form.group_gallery</source>
<target>Galeria</target>
</trans-unit>
<trans-unit id="form_group.options">
<source>form_group.options</source>
<trans-unit id="form.group_options">
<source>form.group_options</source>
<target>Opcions</target>
</trans-unit>
</body>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.cs.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,10 @@
<source>view_all_galleries</source>
<target>Zobrazit všechny galerie</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Média</target>
</trans-unit>
<trans-unit id="form.label_mode">
<source>form.label_mode</source>
<target>Mód</target>
Expand Down
12 changes: 8 additions & 4 deletions src/Resources/translations/SonataMediaBundle.de.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -554,12 +554,16 @@
<source>error.image_too_small</source>
<target>Bild erfordert eine Mindestgröße von %min_width% x %min_height%</target>
</trans-unit>
<trans-unit id="form_group.gallery">
<source>form_group.gallery</source>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Medien</target>
</trans-unit>
<trans-unit id="form.group_gallery">
<source>form.group_gallery</source>
<target>Galerie</target>
</trans-unit>
<trans-unit id="form_group.options">
<source>form_group.options</source>
<trans-unit id="form.group_options">
<source>form.group_options</source>
<target>Optionen</target>
</trans-unit>
</body>
Expand Down
12 changes: 8 additions & 4 deletions src/Resources/translations/SonataMediaBundle.en.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -546,12 +546,16 @@
<source>error.image_too_small</source>
<target>Image too small, it requires size %min_width% x %min_height% as minimum.</target>
</trans-unit>
<trans-unit id="form_group.gallery">
<source>form_group.gallery</source>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.group_gallery">
<source>form.group_gallery</source>
<target>Gallery</target>
</trans-unit>
<trans-unit id="form_group.options">
<source>form_group.options</source>
<trans-unit id="form.group_options">
<source>form.group_options</source>
<target>Options</target>
</trans-unit>
</body>
Expand Down
12 changes: 8 additions & 4 deletions src/Resources/translations/SonataMediaBundle.es.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,16 @@
<source>list.label_size</source>
<target>Tamaño</target>
</trans-unit>
<trans-unit id="form_group.gallery">
<source>form_group.gallery</source>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Multimedia</target>
</trans-unit>
<trans-unit id="form.group_gallery">
<source>form.group_gallery</source>
<target>Galería</target>
</trans-unit>
<trans-unit id="form_group.options">
<source>form_group.options</source>
<trans-unit id="form.group_options">
<source>form.group_options</source>
<target>Opciones</target>
</trans-unit>
</body>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.fa.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@
<source>filter.label_content_type</source>
<target>نوع محتوا</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>رسانه</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>فعال</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.fi.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<source>filter.label_provider_name</source>
<target>Mediatoimittajan nimi</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Käytössä</target>
Expand Down
12 changes: 8 additions & 4 deletions src/Resources/translations/SonataMediaBundle.fr.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -542,12 +542,16 @@
<source>error.image_too_small</source>
<target>Image trop petite, la taille minimum requise est de %min_width% x %min_height%.</target>
</trans-unit>
<trans-unit id="form_group.gallery">
<source>form_group.gallery</source>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Média</target>
</trans-unit>
<trans-unit id="form.group_gallery">
<source>form.group_gallery</source>
<target>Gallerie</target>
</trans-unit>
<trans-unit id="form_group.options">
<source>form_group.options</source>
<trans-unit id="form.group_options">
<source>form.group_options</source>
<target>Options</target>
</trans-unit>
</body>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.hu.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
<source>filter.label_content_type</source>
<target>Típus</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Média</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Engedélyezve</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.it.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@
<source>filter.label_content_type</source>
<target>Tipo di contenuto</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Pubblicato</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.ja.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<source>filter.label_provider_name</source>
<target>プロバイダ名</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>メディア</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Enabled</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.lt.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
<source>filter.label_provider_name</source>
<target>Tiekėjo pavadinimas</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Įjungta</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.nl.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@
<source>filter.label_content_type</source>
<target>Content type</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Ingeschakeld</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.pl.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
<source>filter.label_provider_name</source>
<target>Nazwa dostawcy</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Włączony</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.pt_BR.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<source>filter.label_provider_name</source>
<target>Nome do provisionador</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Mídia</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Habilitado</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.ro.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@
<source>filter.label_author_name</source>
<target>Nume autor</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Media</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Activat</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.ru.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
<source>filter.label_content_type</source>
<target>Тип контента</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Медиа</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Включено</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.sl.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
<source>filter.label_content_type</source>
<target>Vrsta vsebine</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Medijske vsebine</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Omogočeno</target>
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/translations/SonataMediaBundle.uk.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
<source>filter.label_provider_name</source>
<target>Назва провайдера</target>
</trans-unit>
<trans-unit id="form.group_media">
<source>form.group_media</source>
<target>Медіа</target>
</trans-unit>
<trans-unit id="form.label_enabled">
<source>form.label_enabled</source>
<target>Включено</target>
Expand Down

0 comments on commit 5606d31

Please sign in to comment.