Merge remote-tracking branch 'upstream/master'

hechoendrupal · Jul 14, 2017 · 898f1a2 · 898f1a2
2 parents f134dfb + 65983cb
commit 898f1a2
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "composer/installers": "~1.0",
         "doctrine/annotations": "1.2.*",
         "doctrine/collections": "1.3.*",
-        "drupal/console-core": "1.0.0-rc23",
+        "drupal/console-core": "1.0.0-rc24",
         "drupal/console-dotenv": "~0",
         "drupal/console-extend-plugin": "~0",
         "gabordemooij/redbean": "~4.3",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Application.php b/src/Application.php
@@ -25,7 +25,7 @@ class Application extends BaseApplication
     /**
      * @var string
      */
-    const VERSION = '1.0.0-rc23';
+    const VERSION = '1.0.0-rc24';
 
     public function __construct(ContainerInterface $container)
     {

diff --git a/src/Command/Config/ImportCommand.php b/src/Command/Config/ImportCommand.php
@@ -131,7 +131,7 @@ private function configImport(DrupalStyle $io, StorageComparer $storage_comparer
                 $config_importer->import();
                 return true;
             } catch (ConfigImporterException $e) {
-                $message = 'The import failed due to the following reasons:' . "\n";
+                $message = $this->trans('commands.config.import.messages.import-fail') . "\n";
                 $message .= implode("\n", $config_importer->getErrors());
                 $io->error(
                     sprintf(

diff --git a/src/Command/Config/ImportSingleCommand.php b/src/Command/Config/ImportSingleCommand.php
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $directory = $input->getOption('directory');
 
         if (!$file) {
-            $io->error('File option is missing.');
+            $io->error($this->trans('commands.config.import.single..message.missing-file'));
 
             return 1;
         }
@@ -172,7 +172,7 @@ private function configImport($io, StorageComparer $storageComparer)
                     return true;
                 }
             } catch (ConfigImporterException $e) {
-                $message = 'The import failed due to the following reasons:' . "\n";
+                $message = $this->trans('commands.config.import.messages.import-fail') . "\n";
                 $message .= implode("\n", $configImporter->getErrors());
                 $io->error(
                     sprintf(

diff --git a/src/Command/Module/InstallCommand.php b/src/Command/Module/InstallCommand.php
@@ -175,14 +175,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 if ($process->isSuccessful()) {
                     $io->info(
                         sprintf(
-                            'Module %s was downloaded with Composer.',
+                            $this->trans('commands.module.install.messages.download-with-composer'),
                             $moduleItem
                         )
                     );
                 } else {
                     $io->error(
                         sprintf(
-                            'Module %s seems not to be installed with Composer. Halting.',
+                            $this->trans('commands.module.install.messages.not-installed-with-composer'),
                             $moduleItem
                         )
                     );
@@ -202,7 +202,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     unset($module[array_search($invalidModule, $module)]);
                     $io->error(
                         sprintf(
-                            'Invalid module name: %s',
+                            $this->trans('commands.module.install.messages.invalid-name'),
                             $invalidModule
                         )
                     );

diff --git a/src/Extension/Manager.php b/src/Extension/Manager.php
@@ -98,10 +98,10 @@ public function showNoCore()
     }
 
     /**
-     * @param string $nameOnly
+     * @param boolean $nameOnly
      * @return array
      */
-    public function getList($nameOnly)
+    public function getList($nameOnly = false)
     {
         return $this->getExtensions($this->extension, $nameOnly);
     }