From b0f2f8381ef68a66fff96a58e08d5b2110197ff3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 27 Sep 2015 14:06:27 +0200
Subject: [PATCH] Issue #2571561 by lauriii, Cottser, joelpittet, pjonckiere:
Add Twig filter for date formatting
---
core/core.services.yml | 1 +
.../Drupal/Core/Template/TwigExtension.php | 22 +++++++++++++++++++
core/modules/locale/locale.pages.inc | 14 ++----------
.../locale-translation-update-info.html.twig | 12 +++++-----
.../Tests/Core/Template/TwigExtensionTest.php | 22 +++++++++++++++++++
5 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/core/core.services.yml b/core/core.services.yml
index c56c77872ff0..e7915724937f 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1450,6 +1450,7 @@ services:
calls:
- [setUrlGenerator, ['@url_generator']]
- [setThemeManager, ['@theme.manager']]
+ - [setDateFormatter, ['@date.formatter']]
# @todo Figure out what to do about debugging functions.
# @see https://www.drupal.org/node/1804998
twig.extension.debug:
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index 13a7d16fab91..360eed8d1943 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -15,6 +15,7 @@
use Drupal\Component\Utility\Html;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\SafeStringInterface;
+use Drupal\Core\Datetime\DateFormatter;
use Drupal\Core\Render\RenderableInterface;
use Drupal\Core\Render\RendererInterface;
use Drupal\Core\Routing\UrlGeneratorInterface;
@@ -51,6 +52,13 @@ class TwigExtension extends \Twig_Extension {
*/
protected $themeManager;
+ /**
+ * The date formatter.
+ *
+ * @var \Drupal\Core\Datetime\DateFormatter
+ */
+ protected $dateFormatter;
+
/**
* Constructs \Drupal\Core\Template\TwigExtension.
*
@@ -102,6 +110,19 @@ public function setThemeManager(ThemeManagerInterface $theme_manager) {
return $this;
}
+ /**
+ * Sets the date formatter.
+ *
+ * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
+ * The date formatter.
+ *
+ * @return $this
+ */
+ public function setDateFormatter(DateFormatter $date_formatter) {
+ $this->dateFormatter = $date_formatter;
+ return $this;
+ }
+
/**
* {@inheritdoc}
*/
@@ -152,6 +173,7 @@ public function getFilters() {
new \Twig_SimpleFilter('clean_id', '\Drupal\Component\Utility\Html::getId'),
// This filter will render a renderable array to use the string results.
new \Twig_SimpleFilter('render', array($this, 'renderVar')),
+ new \Twig_SimpleFilter('format_date', array($this->dateFormatter, 'format')),
);
}
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index c0e2b65792a1..83bdebb7028e 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -52,18 +52,8 @@ function locale_translation_manual_status() {
* @see \Drupal\locale\Form\TranslationStatusForm
*/
function template_preprocess_locale_translation_update_info(array &$variables) {
- // Build output for available updates.
- if (isset($variables['updates'])) {
- $variables['available_updates'] = [];
- if ($variables['updates']) {
- foreach ($variables['updates'] as $update) {
- $variables['modules'][] = $update['name'];
- // Format date for Twig template.
- $release = $update;
- $release['date'] = \Drupal::service('date.formatter')->format($update['timestamp'], 'html_date');
- $variables['available_updates'][] = $release;
- }
- }
+ foreach ($variables['updates'] as $update) {
+ $variables['modules'][] = $update['name'];
}
}
diff --git a/core/modules/locale/templates/locale-translation-update-info.html.twig b/core/modules/locale/templates/locale-translation-update-info.html.twig
index f26883ebb0ed..74cbffc57ea6 100644
--- a/core/modules/locale/templates/locale-translation-update-info.html.twig
+++ b/core/modules/locale/templates/locale-translation-update-info.html.twig
@@ -7,7 +7,7 @@
*
* Available variables:
* - modules: A list of modules names that have available translation updates.
- * - available_updates: A list of available translation updates.
+ * - updates: A list of available translation updates.
* - not_found: A list of modules missing translation updates.
*
* @see template_preprocess_locale_translation_update_info()
@@ -29,12 +29,12 @@
{%- endtrans -%}
</span>
{% endif %}
- {% if available_updates or not_found %}
+ {% if updates or not_found %}
<div class="locale-translation-update__details">
- {% if available_updates %}
+ {% if updates %}
<ul>
- {% for update in available_updates %}
- <li>{{ update.name }} ({{ update.date }})</li>
+ {% for update in updates %}
+ <li>{{ update.name }} ({{ update.timestamp|format_date('html_date') }})</li>
{% endfor %}
</ul>
{% endif %}
@@ -43,7 +43,7 @@
Prefix the missing updates list if there is an available updates lists
before it.
#}
- {% if available_updates %}
+ {% if updates %}
{{ 'Missing translations for:'|t }}
{% endif %}
{% if not_found %}
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index 3e78e911dd4f..d01641b44875 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -10,6 +10,7 @@
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Render\RenderableInterface;
use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Template\Loader\StringLoader;
use Drupal\Core\Template\TwigEnvironment;
use Drupal\Core\Template\TwigExtension;
use Drupal\Tests\UnitTestCase;
@@ -103,6 +104,27 @@ public function testActiveTheme() {
$this->assertEquals('test_theme', $result);
}
+ /**
+ * Tests the format_date filter.
+ */
+ public function testFormatDate() {
+ $date_formatter = $this->getMockBuilder('\Drupal\Core\Datetime\DateFormatter')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $date_formatter->expects($this->exactly(2))
+ ->method('format')
+ ->willReturn('1978-11-19');
+ $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
+ $extension = new TwigExtension($renderer);
+ $extension->setDateFormatter($date_formatter);
+
+ $loader = new StringLoader();
+ $twig = new \Twig_Environment($loader);
+ $twig->addExtension($extension);
+ $result = $twig->render('{{ time|format_date("html_date") }}');
+ $this->assertEquals($date_formatter->format('html_date'), $result);
+ }
+
/**
* Tests the escaping of objects implementing SafeStringInterface.
*
--
GitLab