Merge 4.x into master

sonata-project · Sep 28, 2019 · f1c52ea · f1c52ea
2 parents 86c1ebc + 3b3289a
commit f1c52ea
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.5.0](https://github.com/sonata-project/SonataUserBundle/compare/4.4.0...4.5.0) - 2019-09-27
+### Fixed
+- Missing Spanish translations.
+
+### Changed
+- Replaced usages of deprecated "templating" service with "twig" where possible.
+
+### Removed
+- Dependency conflict against "jms/serializer:^3.0".
+
+### Changed
+- Add missing dependency against "twig/twig"
+- Changed usages of `{% spaceless %}` tag, which is deprecated as of Twig 1.38
+  with `{% apply spaceless %}` filter
+
 ## [4.4.0](https://github.com/sonata-project/SonataUserBundle/compare/4.3.0...4.4.0) - 2019-06-13
 
 ### Added

diff --git a/src/GoogleAuthenticator/RequestListener.php b/src/GoogleAuthenticator/RequestListener.php
@@ -61,7 +61,7 @@ public function __construct(Helper $helper, TokenStorageInterface $tokenStorage,
             $this->templating = $templating;
 
             @trigger_error(sprintf(
-                'Passing an instance of %s as argument 3 to "%s()" is deprecated since 4.x and will only accept an instance of %s in version 5.0.',
+                'Passing an instance of %s as argument 3 to "%s()" is deprecated since sonata-project/user-bundle 4.5 and will only accept an instance of %s in version 5.0.',
                 EngineInterface::class,
                 __METHOD__,
                 Environment::class

diff --git a/src/Resources/translations/SonataAdminBundle.de.xlf b/src/Resources/translations/SonataAdminBundle.de.xlf
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="de" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="sonata_user">
+        <source>sonata_user</source>
+        <target>Benutzer</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/src/Resources/translations/SonataAdminBundle.en.xlf b/src/Resources/translations/SonataAdminBundle.en.xlf
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="sonata_user">
+        <source>sonata_user</source>
+        <target>Users</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>