Merge branch 'master' of http://github.com/fabpot/Twig-extensions

doc/debug.rst

@@ -1,6 +1,11 @@
 The Debug Extension
 ===================
 
+.. caution::
+
+    This extension is deprecated as of Twig 1.5. Use the Twig built-in `dump`_
+    function instead.
+
 The ``debug`` extension provides a ``debug`` tag that can be used to
 output the content of the current context:
 
@@ -21,3 +26,5 @@ output a specific variable or an expression:
 
     The ``debug`` tag only works when the ``debug`` environment option is set
     to ``true``.
+
+.. _`dump`: http://twig.sensiolabs.org/dump

doc/i18n.rst

@@ -54,6 +54,8 @@ In a translatable string, you can embed variables:
         Hello {{ name }}!
     {% endtrans %}
 
+During the gettext lookup these placeholders are converted. ``{{ name }}`` becomes ``%name%`` so the gettext ``msgid`` for this string would be ``Hello %name%!``.
+
 .. note::
 
     ``{% trans "Hello {{ name }}!" %}`` is not a valid statement.

lib/Twig/Extensions/Extension/Debug.php

@@ -22,16 +22,6 @@ public function getTokenParsers()
         );
     }
 
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array();
-    }
-
     /**
      * Returns the name of the extension.
      *