diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderBase.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderBase.php index 8b7da7a..2b006a1 100644 --- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderBase.php +++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbBuilderBase.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Breadcrumb; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Defines a common base class for breadcrumb builders adding a link generator. @@ -16,7 +16,7 @@ */ abstract class BreadcrumbBuilderBase implements BreadcrumbBuilderInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The link generator. diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php index 0580f11..ecfec14 100644 --- a/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/core/lib/Drupal/Core/Controller/ControllerBase.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Controller; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -33,7 +33,7 @@ */ abstract class ControllerBase implements ContainerInjectionInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The entity manager. diff --git a/core/lib/Drupal/Core/Controller/TitleResolver.php b/core/lib/Drupal/Core/Controller/TitleResolver.php index e102596..b3633c8 100644 --- a/core/lib/Drupal/Core/Controller/TitleResolver.php +++ b/core/lib/Drupal/Core/Controller/TitleResolver.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Controller; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Route; @@ -17,7 +17,7 @@ */ class TitleResolver implements TitleResolverInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The controller resolver. diff --git a/core/lib/Drupal/Core/Datetime/Date.php b/core/lib/Drupal/Core/Datetime/Date.php index 6c2851b..7d66be9 100644 --- a/core/lib/Drupal/Core/Datetime/Date.php +++ b/core/lib/Drupal/Core/Datetime/Date.php @@ -14,14 +14,14 @@ use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Provides a service to handler various date related functionality. */ class Date { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The list of loaded timezones. diff --git a/core/lib/Drupal/Core/Entity/EntityControllerBase.php b/core/lib/Drupal/Core/Entity/EntityControllerBase.php index 364559f..69bbb29 100644 --- a/core/lib/Drupal/Core/Entity/EntityControllerBase.php +++ b/core/lib/Drupal/Core/Entity/EntityControllerBase.php @@ -9,7 +9,7 @@ use Drupal\Core\DependencyInjection\DependencySerialization; use Drupal\Core\Extension\ModuleHandlerInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; /** @@ -19,7 +19,7 @@ */ abstract class EntityControllerBase extends DependencySerialization { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The module handler to invoke hooks on. diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php index cbd8c6b..c21c587 100644 --- a/core/lib/Drupal/Core/Form/FormBase.php +++ b/core/lib/Drupal/Core/Form/FormBase.php @@ -11,7 +11,7 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\DependencyInjection\DependencySerialization; use Drupal\Core\Routing\UrlGeneratorInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -20,7 +20,7 @@ */ abstract class FormBase extends DependencySerialization implements FormInterface, ContainerInjectionInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The current request. diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php index abe72e3..0cef5c4 100644 --- a/core/lib/Drupal/Core/Form/FormBuilder.php +++ b/core/lib/Drupal/Core/Form/FormBuilder.php @@ -18,7 +18,7 @@ use Drupal\Core\Render\Element; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\Url; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -33,7 +33,7 @@ */ class FormBuilder implements FormBuilderInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The module handler. diff --git a/core/lib/Drupal/Core/Installer/Exception/InstallerException.php b/core/lib/Drupal/Core/Installer/Exception/InstallerException.php index e8c1ec3..fdc067c 100644 --- a/core/lib/Drupal/Core/Installer/Exception/InstallerException.php +++ b/core/lib/Drupal/Core/Installer/Exception/InstallerException.php @@ -7,11 +7,15 @@ namespace Drupal\Core\Installer\Exception; +use Drupal\Core\StringTranslation\TranslationTrait; + /** * Base class for exceptions thrown by installer. */ class InstallerException extends \RuntimeException { + use TranslationTrait; + /** * The page title to output. * @@ -20,13 +24,6 @@ class InstallerException extends \RuntimeException { protected $title; /** - * The string translation manager. - * - * @var \Drupal\Core\StringTranslation\TranslationInterface - */ - protected $stringTranslation; - - /** * Constructs a new installer exception. * * @param string $title @@ -52,13 +49,4 @@ public function getTitle() { return $this->title; } - /** - * Translates a string using StringTranslation. - * - * @see \Drupal\Core\StringTranslation\TranslationInterface::translate() - */ - protected function t($string, array $args = array(), array $options = array()) { - return $this->stringTranslation->translate($string, $args, $options); - } - } diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php index 0df1cbb..c1b6b5a 100644 --- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php +++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php @@ -11,7 +11,7 @@ use Drupal\Component\Plugin\Exception\PluginException; use Drupal\Core\Plugin\Context\Context; use Drupal\Component\Plugin\Discovery\DiscoveryInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Drupal specific class for plugins that use context. @@ -22,7 +22,7 @@ */ abstract class ContextAwarePluginBase extends ComponentContextAwarePluginBase { - use StringTranslationAwareTrait; + use TranslationTrait; /** * Override of \Drupal\Component\Plugin\ContextAwarePluginBase::__construct(). diff --git a/core/lib/Drupal/Core/Plugin/PluginBase.php b/core/lib/Drupal/Core/Plugin/PluginBase.php index 86ae503..da5dafa 100644 --- a/core/lib/Drupal/Core/Plugin/PluginBase.php +++ b/core/lib/Drupal/Core/Plugin/PluginBase.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Plugin; use Drupal\Component\Plugin\PluginBase as ComponentPluginBase; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -16,7 +16,7 @@ */ abstract class PluginBase extends ComponentPluginBase { - use StringTranslationAwareTrait; + use TranslationTrait; /** * An array of service IDs keyed by property name used for serialization. diff --git a/core/lib/Drupal/Core/StringTranslation/StringTranslationAwareTrait.php b/core/lib/Drupal/Core/StringTranslation/TranslationTrait.php similarity index 95% rename from core/lib/Drupal/Core/StringTranslation/StringTranslationAwareTrait.php rename to core/lib/Drupal/Core/StringTranslation/TranslationTrait.php index 675d82c..ae9d09a 100644 --- a/core/lib/Drupal/Core/StringTranslation/StringTranslationAwareTrait.php +++ b/core/lib/Drupal/Core/StringTranslation/TranslationTrait.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\StringTranslation\StringTranslationAwareTrait. + * Contains \Drupal\Core\StringTranslation\TranslationTrait. */ namespace Drupal\Core\StringTranslation; @@ -14,11 +14,12 @@ * string extractor tools can find all translatable strings. This method must wrap * \Drupal\Core\StringTranslation\TranslationInterface::translate(). * This trait provides this method in a re-usable way. + * * Procedural code must use the global function t(). Any other approach will * result in untranslatable strings, because the string extractor will not be * able to find them. */ -trait StringTranslationAwareTrait { +trait TranslationTrait { /** * The string translation service. diff --git a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php index 470a139..8d1e60d 100644 --- a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php +++ b/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php @@ -12,7 +12,7 @@ use Drupal\Core\Language\LanguageManager; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Manages discovery and instantiation of block plugins. @@ -23,6 +23,8 @@ */ class BlockManager extends DefaultPluginManager { + use TranslationTrait; + /** * An array of all available modules and their data. * diff --git a/core/modules/book/lib/Drupal/book/BookManager.php b/core/modules/book/lib/Drupal/book/BookManager.php index b0a9124..ffe7dac 100644 --- a/core/modules/book/lib/Drupal/book/BookManager.php +++ b/core/modules/book/lib/Drupal/book/BookManager.php @@ -13,7 +13,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\node\NodeInterface; @@ -22,7 +22,7 @@ */ class BookManager implements BookManagerInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * Defines the maximum supported depth of the book tree. diff --git a/core/modules/comment/lib/Drupal/comment/CommentManager.php b/core/modules/comment/lib/Drupal/comment/CommentManager.php index 09da897..9ac50c1 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentManager.php +++ b/core/modules/comment/lib/Drupal/comment/CommentManager.php @@ -14,7 +14,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Routing\UrlGeneratorInterface; use Drupal\Core\Session\AccountInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\field\FieldInfo; @@ -23,7 +23,7 @@ */ class CommentManager implements CommentManagerInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The field info service. diff --git a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/DateFormat.php b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/DateFormat.php index da0701f..00b9688 100644 --- a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/DateFormat.php +++ b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/DateFormat.php @@ -11,14 +11,14 @@ use Drupal\Core\Ajax\AjaxResponse; use Drupal\Core\Ajax\ReplaceCommand; use Drupal\Core\Language\Language; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Defines the date format element for the configuration translation interface. */ class DateFormat implements ElementInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * {@inheritdoc} diff --git a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textarea.php b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textarea.php index 02d70de..fe6b8cb 100644 --- a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textarea.php +++ b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textarea.php @@ -8,14 +8,14 @@ namespace Drupal\config_translation\FormElement; use Drupal\Core\Language\Language; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Defines the textarea element for the configuration translation interface. */ class Textarea implements ElementInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * {@inheritdoc} diff --git a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textfield.php b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textfield.php index 1e6794c..ca61b4c 100644 --- a/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textfield.php +++ b/core/modules/config_translation/lib/Drupal/config_translation/FormElement/Textfield.php @@ -8,14 +8,14 @@ namespace Drupal\config_translation\FormElement; use Drupal\Core\Language\Language; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; /** * Defines the textfield element for the configuration translation interface. */ class Textfield implements ElementInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * {@inheritdoc} diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Plugin/Derivative/FieldUiLocalTask.php b/core/modules/field_ui/lib/Drupal/field_ui/Plugin/Derivative/FieldUiLocalTask.php index bd245cb..64f2fbd 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Plugin/Derivative/FieldUiLocalTask.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Plugin/Derivative/FieldUiLocalTask.php @@ -11,7 +11,7 @@ use Drupal\Component\Plugin\Derivative\DerivativeBase; use Drupal\Core\Plugin\Discovery\ContainerDerivativeInterface; use Drupal\Core\Routing\RouteProviderInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -20,7 +20,7 @@ */ class FieldUiLocalTask extends DerivativeBase implements ContainerDerivativeInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The route provider. diff --git a/core/modules/forum/lib/Drupal/forum/ForumManager.php b/core/modules/forum/lib/Drupal/forum/ForumManager.php index 464eb0f..4c0ee67 100644 --- a/core/modules/forum/lib/Drupal/forum/ForumManager.php +++ b/core/modules/forum/lib/Drupal/forum/ForumManager.php @@ -13,7 +13,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\comment\CommentInterface; use Drupal\field\FieldInfo; use Drupal\node\NodeInterface; @@ -23,7 +23,7 @@ */ class ForumManager extends DependencySerialization implements ForumManagerInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * Forum sort order, newest first. diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php b/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php index 17a4cde..0119b9e 100644 --- a/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php +++ b/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php @@ -8,7 +8,7 @@ namespace Drupal\migrate; use Drupal\Core\Utility\Error; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; @@ -17,7 +17,7 @@ */ class MigrateExecutable { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The configuration of the migration to do. diff --git a/core/modules/update/lib/Drupal/update/UpdateManager.php b/core/modules/update/lib/Drupal/update/UpdateManager.php index a97e87a..a6e7222 100644 --- a/core/modules/update/lib/Drupal/update/UpdateManager.php +++ b/core/modules/update/lib/Drupal/update/UpdateManager.php @@ -10,7 +10,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\KeyValueStore\KeyValueFactoryInterface; use Drupal\Core\StringTranslation\TranslationInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\Utility\ProjectInfo; /** @@ -18,7 +18,7 @@ */ class UpdateManager implements UpdateManagerInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The update settings diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityArgumentValidator.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityArgumentValidator.php index 6f0fdc9..e3c49d6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityArgumentValidator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityArgumentValidator.php @@ -10,7 +10,7 @@ use Drupal\Component\Plugin\Derivative\DerivativeBase; use Drupal\Core\Plugin\Discovery\ContainerDerivativeInterface; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\StringTranslation\StringTranslationAwareTrait; +use Drupal\Core\StringTranslation\TranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -23,7 +23,7 @@ */ class ViewsEntityArgumentValidator extends DerivativeBase implements ContainerDerivativeInterface { - use StringTranslationAwareTrait; + use TranslationTrait; /** * The base plugin ID this derivative is for. diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationAwareTraitTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationTraitTest.php similarity index 76% rename from core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationAwareTraitTest.php rename to core/tests/Drupal/Tests/Core/StringTranslation/TranslationTraitTest.php index 5d9b1b7..19a107b 100644 --- a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationAwareTraitTest.php +++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationTraitTest.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Tests\Core\StringTranslation\StringTranslationAwareTraitTest. + * Contains \Drupal\Tests\Core\StringTranslation\TranslationTraitTest. */ namespace Drupal\Tests\Core\StringTranslation; @@ -10,15 +10,15 @@ use Drupal\Tests\UnitTestCase; /** - * Tests \Drupal\Core\StringTranslation\StringTranslationAwareTrait. + * Tests \Drupal\Core\StringTranslation\TranslationTrait. * - * @see \Drupal\Core\StringTranslation\StringTranslationAwareTrait - * @coversDefaultClass \Drupal\Core\StringTranslation\StringTranslationAwareTrait + * @see \Drupal\Core\StringTranslation\TranslationTrait + * @coversDefaultClass \Drupal\Core\StringTranslation\TranslationTrait * * @group Drupal * @group StringTranslation */ -class StringTranslationAwareTraitTest extends UnitTestCase { +class TranslationTraitTest extends UnitTestCase { /** * A reflection of self::$translation. @@ -28,7 +28,7 @@ class StringTranslationAwareTraitTest extends UnitTestCase { protected $reflection; /** - * The mock under test that uses StringTranslationAwareTrait. + * The mock under test that uses TranslationTrait. * * @var object * @see PHPUnit_Framework_MockObject_Generator::getObjectForTrait() @@ -50,7 +50,7 @@ public static function getInfo() { * {@inheritdoc} */ public function setUp() { - $this->translation = $this->getObjectForTrait('\Drupal\Core\StringTranslation\StringTranslationAwareTrait'); + $this->translation = $this->getObjectForTrait('\Drupal\Core\StringTranslation\TranslationTrait'); $stub = $this->getStringTranslationStub(); $stub->expects($this->any()) ->method('formatPlural')