[Translation] added extract messages from controllers

symfony · thomasage · Apr 2, 2018 · Apr 3, 2018 · Apr 3, 2018 · Apr 4, 2018
commit 83b7a94fc8f04fe1f668aabe9e12edcce9c89009
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -43,8 +43,9 @@ class TranslationUpdateCommand extends Command
    private $defaultLocale;
    private $defaultTransPath;
    private $defaultViewsPath;
+    private $defaultControllersPath;

-    public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null)
+    public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null, string $defaultControllersPath = null)
    {
        parent::__construct();

@@ -54,6 +55,7 @@ public function __construct(TranslationWriterInterface $writer, TranslationReade
        $this->defaultLocale = $defaultLocale;
        $this->defaultTransPath = $defaultTransPath;
        $this->defaultViewsPath = $defaultViewsPath;
+        $this->defaultControllersPath = $defaultControllersPath;
    }

    /**
@@ -128,6 +130,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
            $viewsPaths[] = $this->defaultViewsPath;
        }
        $controllersPaths = array($kernel->getRootDir().'/Controller');
+        if ($this->defaultControllersPath) {
+            $controllersPaths[] = $this->defaultControllersPath;
+        }
        $currentName = 'app folder';

        // Override with provided Bundle info
-Original file line number
+Diff line change
@@ -43,8 +43,9 @@ class TranslationUpdateCommand extends Command
         private $defaultLocale;
         private $defaultTransPath;
         private $defaultViewsPath;
+        private $defaultControllersPath;
-        public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null)
+        public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null, string $defaultControllersPath = null)
         {
             parent::__construct();
@@ -54,6 +55,7 @@ public function __construct(TranslationWriterInterface $writer, TranslationReade
             $this->defaultLocale = $defaultLocale;
             $this->defaultTransPath = $defaultTransPath;
             $this->defaultViewsPath = $defaultViewsPath;
+            $this->defaultControllersPath = $defaultControllersPath;
         }
         /**
@@ -128,6 +130,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $viewsPaths[] = $this->defaultViewsPath;
             }
             $controllersPaths = array($kernel->getRootDir().'/Controller');
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            linaori
  

      

      

      


        Apr 2, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      What if my controllers are somewhere else?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      



      

  Author


  

  
    
      

      
            thomasage
  

      

      

      


        Apr 3, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      @iltar you're right. I added a parameter to constructor (as for the views). But I'm not sure how to test it. Can you help me?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            linaori
  

      

      

      


        Apr 3, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      What about making the parameter an array of paths? That would cover multiple locations. You can test it by writing fixtures for your test, writing controllers with translations.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      



      

  Author


  

  
    
      

      
            thomasage
  

      

      

      


        Apr 3, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      An array of paths sounds great to me, but for the tests I wonder how to set path(s) when I call the command on CLI (bin/console translation:update)?
When I try your suggestion, it returns null for $this->router.

I'm not sure it's OK to have a behaviour for templates (parameter in constructor) and another behaviour for controllers (find auto).
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+            if ($this->defaultControllersPath) {
+                $controllersPaths[] = $this->defaultControllersPath;
+            }
             $currentName = 'app folder';
             // Override with provided Bundle info
-          Expand Down