Merge 2.x into master

sonata-project · Jan 26, 2018 · 847198f · 847198f
2 parents 1a6b539 + df721a9
commit 847198f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": "^7.1",
         "sonata-project/admin-bundle": "^3.28",
-        "sonata-project/block-bundle": "^3.8",
+        "sonata-project/block-bundle": "^3.11",
         "sonata-project/core-bundle": "^3.7.1",
         "symfony/config": "^2.8 || ^3.2 || ^4.0",
         "symfony/dependency-injection": "^2.8 || ^3.2 || ^4.0",

diff --git a/docs/reference/installation.rst b/docs/reference/installation.rst
@@ -85,7 +85,7 @@ Extend the `SonataAdminBundle layout`_ and add the SonataTranslationBundle style
 .. code-block:: html+jinja
 
     {# app/Resources/views/admin/layout.html.twig #}
-    {% extends 'SonataAdminBundle::standard_layout.html.twig' %}
+    {% extends '@SonataAdmin/standard_layout.html.twig' %}
 
     {% block stylesheets %}
         {{  parent() }}

diff --git a/src/Block/LocaleSwitcherBlockService.php b/src/Block/LocaleSwitcherBlockService.php
@@ -43,7 +43,7 @@ public function configureSettings(OptionsResolver $resolver): void
             [
                 'admin' => null,
                 'object' => null,
-                'template' => 'SonataTranslationBundle:Block:block_locale_switcher.html.twig',
+                'template' => '@SonataTranslation/Block/block_locale_switcher.html.twig',
                 'locale_switcher_route' => null,
                 'locale_switcher_route_parameters' => [],
             ]

diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
@@ -7,7 +7,7 @@
         <service id="sonata_translation.block.locale_switcher" class="%sonata_translation.block.locale_switcher.class%">
             <tag name="sonata.block"/>
             <argument>sonata_translation.block.locale_switcher</argument>
-            <argument type="service" id="templating"/>
+            <argument type="service" id="sonata.templating"/>
         </service>
     </services>
 </container>