From b090f1b71634e613013ff7a6e39127f16e892f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Tue, 5 Mar 2019 14:23:38 +0100 Subject: [PATCH] Use localizeddate for showing date information in templates. --- .gitignore | 1 + .idea/php.xml | 1 + composer.json | 4 +- composer.lock | 57 +++++++++++++++++++++++++++- config/packages/twig_extensions.yaml | 11 ++++++ symfony.lock | 12 ++++++ templates/show_part_info.html.twig | 4 +- 7 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 config/packages/twig_extensions.yaml diff --git a/.gitignore b/.gitignore index 010db53e..a0f6acf5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ .idea/ +.idea/* ###> symfony/webpack-encore-bundle ### /node_modules/ /public/build/ diff --git a/.idea/php.xml b/.idea/php.xml index 9a39bcf2..f82df923 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -113,6 +113,7 @@ + diff --git a/composer.json b/composer.json index 48466cdb..dfa51fca 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,9 @@ "symfony/validator": "4.2.*", "symfony/web-link": "4.2.*", "symfony/webpack-encore-bundle": "^1.1", - "symfony/yaml": "4.2.*" + "symfony/yaml": "4.2.*", + "twig/extensions": "^1.5", + "webmozart/assert": "^1.4" }, "require-dev": { "symfony/debug-pack": "*", diff --git a/composer.lock b/composer.lock index b50dd9cc..71d938f9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "54e0b48ecf19934241734a4229c9b47f", + "content-hash": "b7f3621e8185fed6caafdf0430d434c3", "packages": [ { "name": "doctrine/annotations", @@ -5147,6 +5147,61 @@ "homepage": "https://symfony.com", "time": "2019-02-23T15:17:42+00:00" }, + { + "name": "twig/extensions", + "version": "v1.5.4", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig-extensions.git", + "reference": "57873c8b0c1be51caa47df2cdb824490beb16202" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/57873c8b0c1be51caa47df2cdb824490beb16202", + "reference": "57873c8b0c1be51caa47df2cdb824490beb16202", + "shasum": "" + }, + "require": { + "twig/twig": "^1.27|^2.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.4", + "symfony/translation": "^2.7|^3.4" + }, + "suggest": { + "symfony/translation": "Allow the time_diff output to be translated" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5-dev" + } + }, + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + }, + "psr-4": { + "Twig\\Extensions\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Common additional features for Twig that do not directly belong in core", + "keywords": [ + "i18n", + "text" + ], + "time": "2018-12-05T18:34:18+00:00" + }, { "name": "twig/twig", "version": "v2.6.2", diff --git a/config/packages/twig_extensions.yaml b/config/packages/twig_extensions.yaml new file mode 100644 index 00000000..a45911f8 --- /dev/null +++ b/config/packages/twig_extensions.yaml @@ -0,0 +1,11 @@ +services: + _defaults: + public: false + autowire: true + autoconfigure: true + + # Uncomment any lines below to activate that Twig extension + #Twig\Extensions\ArrayExtension: ~ + #Twig\Extensions\DateExtension: ~ + Twig\Extensions\IntlExtension: ~ + #Twig\Extensions\TextExtension: ~ diff --git a/symfony.lock b/symfony.lock index e31d6311..6a2ab329 100644 --- a/symfony.lock +++ b/symfony.lock @@ -500,6 +500,18 @@ "symfony/yaml": { "version": "v4.2.3" }, + "twig/extensions": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "1.0", + "ref": "ddb2e0a77773b7fd75d8d649545f174e664500ab" + }, + "files": [ + "./config/packages/twig_extensions.yaml" + ] + }, "twig/twig": { "version": "v2.6.2" }, diff --git a/templates/show_part_info.html.twig b/templates/show_part_info.html.twig index de9835be..a367fd10 100644 --- a/templates/show_part_info.html.twig +++ b/templates/show_part_info.html.twig @@ -198,7 +198,7 @@
-

{{ part.addedDate | date}} +

{{ part.addedDate | localizeddate("long")}} {#{if !empty($creation_user)} {% trans %}by{% endtrans %} {if $can_visit_user} {$creation_user} @@ -213,7 +213,7 @@

-

{{ part.lastModified | date }} +

{{ part.lastModified | localizeddate("long") }} {# {if !empty($last_modified_user)} {% trans %}by{% endtrans %} {if $can_visit_user} {$last_modified_user}