merged branch shieldo/patch-1 (PR sensiolabs#110)

Commits
-------

e98b3d1 Changed some console output to more idiomatic English.
305669a merged branch rdohms/master (PR sensiolabs#104)
040c61c Changing default extension from xliff to xlf according to this: symfony/symfony#2738
67bf607 merged branch cordoval/patch-1 (PR sensiolabs#91)
711df44 Update Resources/doc/index.rst
0d58617 updated Doctrine namespaces as the bundle moved to the Doctrine organization

Discussion
----------

Changed some console output to more idiomatic English.

Command/GenerateBundleCommand.php

@@ -191,7 +191,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         // optional files to generate
         $output->writeln(array(
             '',
-            'To help you getting started faster, the command can generate some',
+            'To help you get started faster, the command can generate some',
             'code snippets for you.',
             '',
         ));

Command/GenerateDoctrineCommand.php

@@ -11,8 +11,8 @@
 
 namespace Sensio\Bundle\GeneratorBundle\Command;
 
-use Symfony\Bundle\DoctrineBundle\Mapping\MetadataFactory;
-use Symfony\Bundle\DoctrineBundle\Command\DoctrineCommand;
+use Doctrine\Bundle\DoctrineBundle\Mapping\MetadataFactory;
+use Doctrine\Bundle\DoctrineBundle\Command\DoctrineCommand;
 
 abstract class GenerateDoctrineCommand extends DoctrineCommand
 {

Command/GenerateDoctrineFormCommand.php

@@ -17,7 +17,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Bundle\DoctrineBundle\Mapping\MetadataFactory;
+use Doctrine\Bundle\DoctrineBundle\Mapping\MetadataFactory;
 use Sensio\Bundle\GeneratorBundle\Generator\DoctrineFormGenerator;
 
 /**

Generator/BundleGenerator.php

@@ -67,7 +67,7 @@ public function generate($namespace, $bundle, $dir, $format, $structure)
             $this->filesystem->mkdir($dir.'/Resources/doc');
             $this->filesystem->touch($dir.'/Resources/doc/index.rst');
             $this->filesystem->mkdir($dir.'/Resources/translations');
-            $this->filesystem->copy($this->skeletonDir.'/messages.fr.xliff', $dir.'/Resources/translations/messages.fr.xliff');
+            $this->filesystem->copy($this->skeletonDir.'/messages.fr.xlf', $dir.'/Resources/translations/messages.fr.xlf');
             $this->filesystem->mkdir($dir.'/Resources/public/css');
             $this->filesystem->mkdir($dir.'/Resources/public/images');
             $this->filesystem->mkdir($dir.'/Resources/public/js');

Resources/doc/index.rst

@@ -26,7 +26,7 @@ Then, like for any other bundle, include it in your Kernel class::
 List of Available Commands
 --------------------------
 
-The ``SensioGeneratorBundle`` come with four new commands that can be run in
+The ``SensioGeneratorBundle`` comes with four new commands that can be run in
 interactive mode or not. The interactive mode asks you some questions to
 configure the command parameters to generate the definitive code. The list of
 new commands are listed below: