opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-20 09:56:34 -07:00 • committed by Greg Anderson
parent b11a755ba8
commit c0a0d5a94c
6920 changed files with 64395 additions and 57312 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\PluralTranslatableMarkup.
*/
namespace Drupal\Core\StringTranslation;
/**

9
core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\StringTranslationTrait.
*/
namespace Drupal\Core\StringTranslation;
/**
@ -73,7 +68,7 @@ trait StringTranslationTrait {
* @ingroup sanitization
*/
protected function t($string, array $args = array(), array $options = array()) {
return $this->getStringTranslation()->translate($string, $args, $options);
return new TranslatableMarkup($string, $args, $options, $this->getStringTranslation());
}
/**
@ -82,7 +77,7 @@ trait StringTranslationTrait {
* @see \Drupal\Core\StringTranslation\TranslationInterface::formatPlural()
*/
protected function formatPlural($count, $singular, $plural, array $args = array(), array $options = array()) {
return $this->getStringTranslation()->formatPlural($count, $singular, $plural, $args, $options);
return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this->getStringTranslation());
}
/**

5
core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\TranslatableMarkup.
*/
namespace Drupal\Core\StringTranslation;
use Drupal\Component\Render\FormattableMarkup;

5
core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\TranslationInterface.
*/
namespace Drupal\Core\StringTranslation;
/**

5
core/lib/Drupal/Core/StringTranslation/TranslationManager.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\TranslationManager.
*/
namespace Drupal\Core\StringTranslation;
use Drupal\Core\Language\LanguageDefault;

5
core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\TranslationWrapper.
*/
namespace Drupal\Core\StringTranslation;
/**

5
core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\Translator\CustomStrings.
*/
namespace Drupal\Core\StringTranslation\Translator;
use Drupal\Core\Site\Settings;

5
core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\Translator\FileTranslation.
*/
namespace Drupal\Core\StringTranslation\Translator;
use Drupal\Component\Gettext\PoStreamReader;

5
core/lib/Drupal/Core/StringTranslation/Translator/StaticTranslation.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\Translator\StaticTranslation.
*/
namespace Drupal\Core\StringTranslation\Translator;
/**

5
core/lib/Drupal/Core/StringTranslation/Translator/TranslatorInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Core\StringTranslation\Translator\TranslatorInterface.
*/
namespace Drupal\Core\StringTranslation\Translator;
/**