Merge remote-tracking branch 'upstream/master' into feature/unCamelCase

composer.json

@@ -16,5 +16,11 @@
     },
     "autoload": {
         "psr-0": { "Twig_Extensions_": "lib/" }
-    }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
+    "minimum-stability": "dev"
 }

doc/i18n.rst

@@ -141,8 +141,10 @@ templates. Here is a simple example to get you started::
     // iterate over all your templates
     foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tplDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file)
     {
-      // force compilation
-      $twig->loadTemplate(str_replace($tplDir.'/', '', $file));
+        // force compilation
+        if ($file->isFile()) {
+            $twig->loadTemplate(str_replace($tplDir.'/', '', $file));
+        }
     }
 
 Use the standard ``xgettext`` utility as you would have done with plain PHP
@@ -152,5 +154,10 @@ code:
 
     xgettext --default-domain=messages -p ./locale --from-code=UTF-8 -n --omit-header -L PHP /tmp/cache/*.php
 
-.. _`gettext`:       http://www.php.net/gettext
-.. _`documentation`: http://fr.php.net/manual/en/function.gettext.php
+Another workaround is to use `Twig Gettext Extractor`_ and extract the template
+strings right from `Poedit`_.
+
+.. _`gettext`:                http://www.php.net/gettext
+.. _`documentation`:          http://fr.php.net/manual/en/function.gettext.php
+.. _`Twig Gettext Extractor`: https://github.com/umpirsky/Twig-Gettext-Extractor
+.. _`Poedit`:                 http://www.poedit.net/