Merge pull request #482 from symfony-cmf/locale-cleanup

Locale cleanup

Author: wouterj

bundles/create/developing-hallo.rst

@@ -23,15 +23,14 @@ To use this template, specify ``hallo-coffee`` as editor in the
 
         {% render(controller(
             "cmf_create.jsloader.controller:includeJSFilesAction",
-            {'editor': 'hallo-coffee', '_locale': app.request.locale }
+            {'editor': 'hallo-coffee' }
         )) %}
 
     .. code-block:: php
 
         <?php $view['actions']->render(
             new ControllerReference('cmf_create.jsloader.controller:includeJSFilesAction", array(
                 'editor'  => 'hallo-coffee',
-                '_locale' => $app->getRequest()->getLocale(),
             ))
         ) ?>
 

bundles/create/introduction.rst

@@ -349,40 +349,20 @@ higher, the method reads:
 
     .. code-block:: jinja
 
-        {% render(controller(
-            "cmf_create.jsloader.controller:includeJSFilesAction",
-            {'_locale': app.request.locale}
-        )) %}
+        {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %}
 
     .. code-block:: php
 
         <?php $view['actions']->render(
-            new ControllerReference('cmf_create.jsloader.controller:includeJSFilesAction', array(
-                '_locale' => $app->getRequest()->getLocale(),
-            ))
-        ) ?>
-
-For Symfony 2.1, the syntax is:
-
-.. configuration-block::
-
-    .. code-block:: jinja
-
-        {% render "cmf_create.jsloader.controller:includeJSFilesAction" with {'_locale': app.request.locale} %}
-
-    .. code-block:: php
-
-        <?php
-        $view['actions']->render('cmf_create.jsloader.controller:includeJSFilesAction', array(
-            '_locale' => $app->getRequest()->getLocale(),
+            new ControllerReference('cmf_create.jsloader.controller:includeJSFilesAction')
         ) ?>
 
 .. tip::
 
     You can include this call unconditionally. The controller checks if the
     current user is allowed to edit and only in that case includes the
     JavaScript.
-        
+
 .. note::
 
     The provided JavaScript file configures create.js and the editor. If you

bundles/create/other-editors.rst

@@ -42,10 +42,7 @@ In your template, load the JavaScript files using:
 
     .. code-block:: jinja
 
-        {% render(controller(
-            "cmf_create.jsloader.controller:includeJSFilesAction",
-            {"editor": "hallo", "_locale":app.request.locale}
-        )) %}
+        {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %}
 
     .. code-block:: php
 
@@ -99,15 +96,14 @@ editor parameter:
 
         {% render(controller(
                 "cmf_create.jsloader.controller:includeJSFilesAction",
-                 {'editor': 'myeditor', '_locale': app.request.locale }
+                 {'editor': 'myeditor' }
         )) %}
 
     .. code-block:: php
 
         <?php $view['actions']->render(
             new ControllerReference('cmf_create.jsloader.controller:includeJSFilesAction', array(
                 'editor'  => 'myeditor',
-                '_locale' => $app->getRequest()->getLocale(),
             ))
         ); ?>
 

bundles/tree_browser/introduction.rst

@@ -148,8 +148,7 @@ from the admin tree:
 
         {% render 'sonata.admin.doctrine_phpcr.tree_controller:treeAction' with {
             'root':     sitePath ~ "/menu",
-            'selected': menuNodeId,
-            '_locale':  app.request.locale
+            'selected': menuNodeId
         } %}
         <script type="text/javascript">
             $(document).ready(function() {
@@ -169,7 +168,6 @@ from the admin tree:
         $view['actions']->render('sonata.admin.doctrine_phpcr.tree_controller:treeAction', array(
             'root'     => $sitePath . '/menu',
             'selected' => $menuNodeId,
-            '_locale'  => $app->getRequest()->getLocale()
         ))?>
         <script type="text/javascript">
             $(document).ready(function() {

cookbook/handling_multilang_documents.rst

@@ -40,14 +40,6 @@ several CMF bundles wanting the list of allowed locales, we recommend putting
 them into a parameter ``%locales%``, see the `cmf-sandbox config.yml file`_
 for an example.
 
-.. tip::
-
-    Whenever you do a sub-request, for example to call a controller from a twig
-    template, do not forget to pass the ``app.request.locale`` along or you will
-    lose the request locale and fall back to the default.
-    See for example the action to include the create.js JavaScript files in the
-    :ref:`create.js reference <bundle-create-usage-embed>`.
-
 PHPCR-ODM multi-language Documents
 ----------------------------------