Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2332989 by Cottser: Fixed Twig trans tag debug is still hooked up to Settings.

8.0.x
Alex Pott 2014-09-09 15:11:04 +01:00
parent 973fd26d96
commit 078f09a588
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Template/TwigNodeTrans.php
View File

@ -83,7 +83,7 @@ class TwigNodeTrans extends \Twig_Node {
$compiler->raw(')'); $compiler->raw(')');
// Append translation debug markup, if necessary. // Append translation debug markup, if necessary.
if (Settings::get('twig_debug', FALSE)) { if ($compiler->getEnvironment()->isDebug()) {
$compiler->raw(" . '\n<!-- TRANSLATION: "); $compiler->raw(" . '\n<!-- TRANSLATION: ");
$compiler->subcompile($singular); $compiler->subcompile($singular);
if (!empty($plural)) { if (!empty($plural)) {

13
core/modules/system/src/Tests/Theme/TwigTransTest.php
View File

@ -162,13 +162,12 @@ class TwigTransTest extends WebTestBase {
* Test Twig "trans" debug markup. * Test Twig "trans" debug markup.
*/ */
public function testTwigTransDebug() { public function testTwigTransDebug() {
// Enable twig debug and write to the test settings.php file. // Enable debug, rebuild the service container, and clear all caches.
$this->settingsSet('twig_debug', TRUE); $parameters = $this->container->getParameter('twig.config');
$settings['settings']['twig_debug'] = (object) array( $parameters['debug'] = TRUE;
'value' => TRUE, $this->setContainerParameter('twig.config', $parameters);
'required' => TRUE, $this->rebuildContainer();
); $this->resetAll();
$this->writeSettings($settings);
// Get page for assertion testing. // Get page for assertion testing.
$this->drupalGet('twig-theme-test/trans', array('language' => \Drupal::languageManager()->getLanguage('xx'))); $this->drupalGet('twig-theme-test/trans', array('language' => \Drupal::languageManager()->getLanguage('xx')));