Merge branch 'release/2.22.0'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+*2.22.0* (2021-04-08)
+- Add DE translation for CookieConsent
+- Revert and set flickity to version to 2.2.1 to fix strange dev behavior
+
 *2.21.0* (2021-03-24)
 - Update URLs for footer and header #501
 - Fix social icons having the wrong url  6c714a5

VERSION

@@ -1 +1 @@
-2.21.0
+2.22.0

assets/components/organisms/cookie-consent/cookie-consent.js

@@ -17,6 +17,12 @@ function get_cookieconsent_config() {
             'de visites.',
         link: 'Lire les mentions légales',
         href: '//go.epfl.ch/protection-des-donnees'
+        },
+        de: {
+            msg: 'Die Navigation auf dieser Seite verwendet Cookies zur ' +
+              'Verbesserung Ihrer Benutzererfahrung und zur Durchführung von Besucherstatistiken.',
+            link: 'Datenschutzerklärung lesen',
+            href: '//go.epfl.ch/privacy-policy'
         }
     };
     // Retrieve language, default 'fr'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "epfl-elements",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "license": "MIT",
   "main": "index.html",
   "repository": {
@@ -92,7 +92,7 @@
     "clipboard": "^2.0.6",
     "cookieconsent": "^3.1.1",
     "feather-icons": "^4.28.0",
-    "flickity": "^2.2.1",
+    "flickity": "2.2.1",
     "flickity-as-nav-for": "^2.0.1",
     "flickity-fullscreen": "^1.1.1",
     "imagesloaded": "^4.1.4",

yarn.lock

@@ -4661,7 +4661,7 @@ flickity-fullscreen@^1.1.1:
   dependencies:
     flickity "^2.1.0"
 
-flickity@^2.0.0, flickity@^2.1.0, flickity@^2.2.1:
+flickity@2.2.1, flickity@^2.0.0, flickity@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/flickity/-/flickity-2.2.1.tgz#81126e3d656cb54577358a5f959ffdbda088e670"
   integrity sha512-fCZJGNqabgDrIhaUBqt2ydE8c5V6iiB3KQAf6dH3Z45MoDUm7g6+uZmteN0aLV9pzVItNqCbfOJQjsJM/rHuSA==