Skip to content

Commit

Permalink
[generate:module] Validator::trans error, fix #3320 (#3334)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmolivas committed Jun 7, 2017
1 parent 0f0c8fc commit b45770a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
class: RedBeanPHP\R
console.validator:
class: Drupal\Console\Utils\Validator
arguments: ['@console.extension_manager']
arguments: ['@console.extension_manager', '@console.translator_manager']
console.drupal_api:
class: Drupal\Console\Utils\DrupalApi
arguments: ['@app.root', '@entity_type.manager', '@http_client']
Expand Down
17 changes: 13 additions & 4 deletions src/Utils/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,23 @@ class Validator

protected $appRoot;

/*
* TranslatorManager
*/
protected $translatorManager;

/**
* Site constructor.
*
* @param Manager $extensionManager
* @param Manager $extensionManager
* @param TranslatorManager $translatorManager
*/
public function __construct(Manager $extensionManager)
{
public function __construct(
Manager $extensionManager,
TranslatorManager $translatorManager
) {
$this->extensionManager = $extensionManager;
$this->translatorManager = $translatorManager;
}

public function validateModuleName($module)
Expand Down Expand Up @@ -277,7 +286,7 @@ public function validateExtensions($extensions_list, $type, DrupalStyle $io)
if (!empty($checked_extensions['no_extensions'])) {
$io->warning(
sprintf(
$this->trans('validator.warnings.extension-unavailable'),
$this->translatorManager->trans('validator.warnings.extension-unavailable'),
implode(', ', $checked_extensions['no_extensions'])
)
);
Expand Down

0 comments on commit b45770a

Please sign in to comment.