diff --git a/.dockerignore b/.dockerignore
index 9b914fafec..95d7045edf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -23,7 +23,7 @@
 /datas
 /docker-compose.*
 /logs
-/nodes_modules
+/node_modules
 /plugins
 /tmp
 /vendor
diff --git a/.env b/.env
index 2fb773529c..75c614e5d6 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
+PHRASEANET_PROJECT_NAME=Phraseanet
 # Registry from where you pull Docker images
 PHRASEANET_DOCKER_REGISTRY=local
 # Tag of the Docker images
@@ -70,3 +71,10 @@ PHRASEANET_DB_DIR=./volumes/db
 PHRASEANET_ELASTICSEARCH_DIR=./volumes/elasticsearch
 PHRASEANET_THUMBNAILS_DIR=./www/thumbnails
 PHRASEANET_TMP_DIR=./tmp
+
+# For dev who don't have SSH_AUTH_SOCK (avoid an empty volume name)
+SSH_AUTH_SOCK=/dev/null
+
+# Plugin support
+PHRASEANET_PLUGINS=
+PHRASEANET_SSH_PRIVATE_KEY=
diff --git a/Dockerfile b/Dockerfile
index e900d1aea4..3feefd2d3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,8 +82,19 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
     && apt-get install -y --no-install-recommends \
         nodejs \
         yarn \
+        nano \
+        vim \
+        iputils-ping \
+        zsh \
+        ssh \
+        telnet \
+        autoconf \
+        libtool \
+        python \
+        pkg-config \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists \
+    && git clone https://github.com/robbyrussell/oh-my-zsh.git /bootstrap/.oh-my-zsh \
     && mkdir -p /var/alchemy/Phraseanet \
     && chown -R app:app /var/alchemy
 
@@ -99,10 +110,28 @@ RUN composer install --prefer-dist --no-dev --no-progress --no-suggest --classma
 
 COPY --chown=app  . .
 
-RUN rm -rf docker/phraseanet/root \
-    && make install
+RUN make install
 
-ADD docker/phraseanet/ /
+ADD ./docker/builder/root /
+
+# SSH Private repo
+ARG SSH_PRIVATE_KEY
+ARG PHRASEANET_PLUGINS
+
+RUN ( \
+        test ! -z "${SSH_PRIVATE_KEY}" \
+        && mkdir -p ~/.ssh \
+        && echo "${SSH_PRIVATE_KEY}" > ~/.ssh/id_rsa \
+        # make sure github domain.com is accepted
+        && ssh-keyscan -H github.com >> ~/.ssh/known_hosts \
+        && chmod 600 ~/.ssh/id_rsa \
+    ) || echo "Skip SSH key"
+
+RUN ./docker/phraseanet/plugins/console install
+
+ENTRYPOINT ["/bootstrap/entrypoint.sh"]
+
+CMD []
 
 #########################################################################
 # Phraseanet web application image
diff --git a/README.md b/README.md
index 4d9509d731..f394ace118 100644
--- a/README.md
+++ b/README.md
@@ -56,10 +56,17 @@ export PHRASEANET_APP_PORT=8082
 
 It may be easier to deal with a local file to manage our env variables.
 
-You can add your `env.local` at the root of this project and define a command alias in your `~/.bashrc`:
+You can add your `env.local` at the root of this project and define a command function in your `~/.bashrc`:
 
 ```bash
-alias dc="env $(cat env.local | grep -v '#' | tr '\n' ' ') docker-compose"
+# ~/.bashrc or ~/.zshrc
+function dc() {
+    if [ -f env.local ]; then
+        env $(cat env.local | grep -v '#' | tr '\n' ' ') docker-compose $@
+    else
+        docker-compose $@
+    fi
+}
 ```
 
 ### Running the application
@@ -105,6 +112,20 @@ This can be made easily from the builder container:
 > Please note that the phraseanet image does not contain nor `composer` neither `node` tools. This allow the final image to be slim.
 > If you need to use dev tools, ensure you are running the `builder` image!
 
+### Developer shell
+
+You can also obtain a shell access in builder container:
+
+```bash
+docker-compose run --rm builder /bin/bash
+# or
+docker-compose run --rm builder /bin/zsh
+```
+
+In this container you will have the same libraries (PHP, Node, composer, ...) that are used to build images.
+Also you have utils for development like telnet, ping, ssh, git, ...
+Your $HOME/.ssh directory is also mounted to builder's home with your ssh agent.
+
 ### Using Xdebug
 
 Xdebug is enabled by default with the `docker-compose.override.yml`
@@ -132,6 +153,28 @@ XDEBUG_REMOTE_HOST=host.docker.internal
 
 > Don't forget to recreate your container (`docker-compose up -d phraseanet`)
 
+### Build images with plugins
+
+Plugins can be installed during build if you set the `PHRASEANET_PLUGINS` env var as follows:
+
+```bash
+PHRASEANET_PLUGINS="git@github.com:alchemy-fr/Phraseanet-plugin-webgallery.git"
+
+# You can optionally precise the branch to install
+# If not precised, the main branch will be pulled
+PHRASEANET_PLUGINS="git@github.com:alchemy-fr/Phraseanet-plugin-webgallery.git(custom-branch)"
+
+# Plugins are separated by spaces
+PHRASEANET_PLUGINS="git@github.com:foo/bar.git(branch-1) git@github.com:baz/42.git"
+```
+
+If you install private plugins, make sure you export your SSH private key content in order to allow docker build to access the GIT repository:
+```bash
+export PHRASEANET_SSH_PRIVATE_KEY=$(cat ~/.ssh/id_rsa)
+# or if your private key is protected by a passphrase:
+export PHRASEANET_SSH_PRIVATE_KEY=$(openssl rsa -in ~/.ssh/id_rsa -out /tmp/id_rsa_raw && cat /tmp/id_rsa_raw && rm /tmp/id_rsa_raw)
+```
+
 # With Vagrant (deprecated)
 
 ## Development :
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index c9b846aa84..7e2b3dd2b8 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -10,25 +10,34 @@ services:
 
   gateway:
     volumes:
+    - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
     - ./docker/nginx/root/entrypoint.sh:/entrypoint.sh
     - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
     - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
     - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
-    
-    
 
   builder:
     build:
       context: .
       target: builder
-    command: exit 0
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
+    stdin_open: true
+    tty: true
     volumes:
+      - ../:/var/alchemy
       - .:/var/alchemy/Phraseanet
       - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
       - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
       - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
       - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+      - ${SSH_AUTH_SOCK}:/ssh-auth-sock
+      - ${HOME}/.ssh:/home/app/.ssh
+      - dev_vol:/home/app
+    environment:
+      - PHRASEANET_PROJECT_NAME
 
   phraseanet:
     environment:
@@ -36,6 +45,7 @@ services:
     - XDEBUG_CONFIG=remote_host=${XDEBUG_REMOTE_HOST} idekey=${IDE_KEY} remote_enable=1 profiler_enable=${XDEBUG_PROFILER_ENABLED} profiler_output_dir=/var/alchemy/Phraseanet/cache/profiler
     - PHP_IDE_CONFIG
     volumes:
+    - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
     - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
     - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -45,6 +55,7 @@ services:
 
   worker:
     volumes:
+    - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
     - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
     - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
@@ -72,8 +83,17 @@ services:
     volumes:
     - ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data:rw
 
+  kibana:
+    image: kibana:4.6.6
+    ports:
+    - 5601:5601
+
 networks:
   default:
     ipam:
       config:
         - subnet: $PHRASEANET_SUBNET_IPS
+
+volumes:
+  dev_vol:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 4c6f435ee7..e0bd547fbb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,9 @@ services:
     build:
       context: .
       target: phraseanet-nginx
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-nginx:$PHRASEANET_DOCKER_TAG
     restart: on-failure
     volumes:
@@ -21,6 +24,9 @@ services:
     build:
       context: .
       target: phraseanet-fpm
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-fpm:$PHRASEANET_DOCKER_TAG
     restart: on-failure
     depends_on:
@@ -29,6 +35,7 @@ services:
     - rabbitmq
     - elasticsearch
     environment:
+    - PHRASEANET_PROJECT_NAME
     - MAX_BODY_SIZE
     - MAX_INPUT_VARS
     - OPCACHE_ENABLED
@@ -57,6 +64,9 @@ services:
     build:
       context: .
       target: phraseanet-worker
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-worker:$PHRASEANET_DOCKER_TAG
     restart: on-failure
     depends_on:
@@ -65,6 +75,7 @@ services:
     - rabbitmq
     - elasticsearch
     environment:
+    - PHRASEANET_PROJECT_NAME
     - MAX_BODY_SIZE
     - MAX_INPUT_VARS
     - OPCACHE_ENABLED
diff --git a/docker/builder/root/bootstrap/.oh-my-zsh/themes/alchemy.zsh-theme b/docker/builder/root/bootstrap/.oh-my-zsh/themes/alchemy.zsh-theme
new file mode 100644
index 0000000000..807e8b6ef7
--- /dev/null
+++ b/docker/builder/root/bootstrap/.oh-my-zsh/themes/alchemy.zsh-theme
@@ -0,0 +1,7 @@
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='%* %{$fg_bold[green]%}%n%{$fg[grey]%}@%m%{$fg_bold[green]%}%u ${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}] %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}]"
diff --git a/docker/builder/root/bootstrap/.zshrc b/docker/builder/root/bootstrap/.zshrc
new file mode 100644
index 0000000000..ae18e5a4ef
--- /dev/null
+++ b/docker/builder/root/bootstrap/.zshrc
@@ -0,0 +1,56 @@
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+
+export ZSH=$HOME/.oh-my-zsh
+
+ZSH_THEME="alchemy"
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git symfony2)
+
+# User configuration
+
+source $ZSH/oh-my-zsh.sh
+
+alias ll='ls -alFh'
diff --git a/docker/builder/root/bootstrap/entrypoint.d/ohmyzsh.sh b/docker/builder/root/bootstrap/entrypoint.d/ohmyzsh.sh
new file mode 100644
index 0000000000..aded04c7c7
--- /dev/null
+++ b/docker/builder/root/bootstrap/entrypoint.d/ohmyzsh.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ ! -d "$HOME/.oh-my-zsh" ]; then
+    cp -r "/bootstrap/.oh-my-zsh" "$HOME/.oh-my-zsh"
+fi
diff --git a/docker/builder/root/bootstrap/entrypoint.d/zshrc.sh b/docker/builder/root/bootstrap/entrypoint.d/zshrc.sh
new file mode 100644
index 0000000000..71d47ed475
--- /dev/null
+++ b/docker/builder/root/bootstrap/entrypoint.d/zshrc.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+ZSH_FILE="$HOME/.zshrc"
+
+if [ ! -f "$HOME/.zshrc" ]; then
+    cp "/bootstrap/.zshrc" "$HOME/.zshrc"
+fi
diff --git a/docker/builder/root/bootstrap/entrypoint.sh b/docker/builder/root/bootstrap/entrypoint.sh
new file mode 100755
index 0000000000..c8bff0d1bb
--- /dev/null
+++ b/docker/builder/root/bootstrap/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -d /bootstrap/entrypoint.d ]; then
+  for i in /bootstrap/entrypoint.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
+
+if [ ! -t 1 ] ; then
+  echo "No tty available."
+  exit 0
+fi
+
+exec "$@"
diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh
index 1d1fecb989..037fe0aa02 100755
--- a/docker/phraseanet/entrypoint.sh
+++ b/docker/phraseanet/entrypoint.sh
@@ -26,4 +26,6 @@ if [ ${XDEBUG_ENABLED} == "1" ]; then
     docker-php-ext-enable xdebug
 fi
 
+./docker/phraseanet/plugins/console init
+
 bash -e docker-php-entrypoint $@
diff --git a/docker/phraseanet/php.ini.sample b/docker/phraseanet/php.ini.sample
index 774389b614..7f5fc97430 100644
--- a/docker/phraseanet/php.ini.sample
+++ b/docker/phraseanet/php.ini.sample
@@ -935,7 +935,7 @@ cli_server.color = On
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-date.timezone = Europe/Paris
+date.timezone = UTC
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667
diff --git a/docker/phraseanet/plugins/InitCommand.php b/docker/phraseanet/plugins/InitCommand.php
new file mode 100644
index 0000000000..23b7d644b7
--- /dev/null
+++ b/docker/phraseanet/plugins/InitCommand.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Alchemy\Docker\Plugins\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class InitCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('init')
+            ->setDescription('Initialize plugins');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        foreach (glob('./plugins/*') as $dir) {
+            if (is_dir($dir)) {
+                $output->writeln(sprintf('Init <info>%s</info> plugin', basename($dir)));
+                SubCommand::run(sprintf('bin/setup plugin:add %s', $dir));
+            }
+        }
+
+        return 0;
+    }
+}
diff --git a/docker/phraseanet/plugins/InstallCommand.php b/docker/phraseanet/plugins/InstallCommand.php
new file mode 100644
index 0000000000..7b8a28c4cd
--- /dev/null
+++ b/docker/phraseanet/plugins/InstallCommand.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Alchemy\Docker\Plugins\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class InstallCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('install')
+            ->setDescription('Install plugins');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $plugins = trim(getenv('PHRASEANET_PLUGINS'));
+        if (empty($plugins)) {
+            $output->writeln('<comment>No plugin to install... SKIP</comment>');
+
+            return 0;
+        }
+
+        $pluginsDir = 'plugins';
+        if (!is_dir($pluginsDir)) {
+            mkdir($pluginsDir);
+        }
+
+        foreach (explode(' ', $plugins) as $key => $plugin) {
+            $plugin = trim($plugin);
+            $repo = $plugin;
+            $branch = 'master';
+            if (1 === preg_match('#^(.+)\(([^)]+)\)$#', $plugin, $matches)) {
+                $repo = $matches[1];
+                $branch = $matches[2];
+            }
+
+            $pluginPath = './plugin' . $key;
+            if (is_dir($pluginPath)) {
+                SubCommand::run(sprintf('rm -rf %s', $pluginPath));
+            }
+
+            $output->writeln(sprintf('Installing <info>%s</info> (branch: <info>%s</info>)', $repo, $branch));
+            SubCommand::run(sprintf('git clone --single-branch --branch %s %s %s', $branch, $repo, $pluginPath));
+
+            $manifestSrc = $pluginPath.'/manifest.json';
+            if (!file_exists($manifestSrc)) {
+                throw new \Exception(sprintf('Cannot install plugin %s: no manifest.json file found', $plugin));
+            }
+            $pluginDestName = json_decode(file_get_contents($manifestSrc), true)['name'];
+            rename($pluginPath, $pluginsDir.'/'.$pluginDestName);
+            $pluginPath = $pluginsDir.'/'.$pluginDestName;
+
+            if (file_exists($pluginPath.'/composer.json')) {
+                SubCommand::run(sprintf('cd %s && composer install --no-dev', $pluginPath));
+            }
+        }
+
+        return 0;
+    }
+}
diff --git a/docker/phraseanet/plugins/SubCommand.php b/docker/phraseanet/plugins/SubCommand.php
new file mode 100644
index 0000000000..fd2dbc68a1
--- /dev/null
+++ b/docker/phraseanet/plugins/SubCommand.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Alchemy\Docker\Plugins\Command;
+
+function setupStreaming()
+{
+    ini_set('output_buffering', 'off');
+    ini_set('zlib.output_compression', false);
+    if (function_exists('apache_setenv')) {
+        apache_setenv('no-gzip', '1');
+        apache_setenv('dont-vary', '1');
+    }
+}
+
+setupStreaming();
+
+abstract class SubCommand
+{
+    static public function run($cmd)
+    {
+        system($cmd, $return);
+        if (0 !== $return) {
+            throw new \Exception(sprintf('Error %d: %s', $return, $cmd));
+        }
+    }
+}
diff --git a/docker/phraseanet/plugins/console b/docker/phraseanet/plugins/console
new file mode 100755
index 0000000000..00e6f9c66d
--- /dev/null
+++ b/docker/phraseanet/plugins/console
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+namespace Alchemy\Docker\Plugins\Command;
+
+require __DIR__.'/../../../vendor/autoload.php';
+require __DIR__.'/SubCommand.php';
+require __DIR__.'/InstallCommand.php';
+require __DIR__.'/InitCommand.php';
+
+use Symfony\Component\Console\Application;
+
+$application = new Application();
+
+$application->add(new InstallCommand());
+$application->add(new InitCommand());
+
+$application->run();
diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh
index d4d773c829..763a07d8ba 100755
--- a/docker/phraseanet/worker/entrypoint.sh
+++ b/docker/phraseanet/worker/entrypoint.sh
@@ -15,4 +15,4 @@ if [ ${XDEBUG_ENABLED} == "1" ]; then
     docker-php-ext-enable xdebug
 fi
 
-runuser -u app "$@"
+runuser -u app -- $@
diff --git a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
index 2d9d211612..53e4ffed39 100644
--- a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
@@ -15,6 +15,21 @@ use Alchemy\Phrasea\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+function normalizePath($path) {
+    return array_reduce(explode('/', $path), function ($a, $b) {
+			if($a === 0)
+				$a = '/';
+
+			if($b === '' || $b === '.')
+				return $a;
+
+			if($b === '..')
+				return dirname($a);
+
+			return preg_replace('/\/+/', '/', "$a/$b");
+    }, 0);
+}
+
 abstract class AbstractPluginCommand extends Command
 {
     protected function validatePlugins(InputInterface $input, OutputInterface $output)
@@ -54,33 +69,42 @@ abstract class AbstractPluginCommand extends Command
 
     protected function doInstallPlugin($source, InputInterface $input, OutputInterface $output)
     {
-        $temporaryDir = $this->container['temporary-filesystem']->createTemporaryDirectory();
-
-        $output->write("Importing <info>$source</info>...");
-        $this->container['plugins.importer']->import($source, $temporaryDir);
-        $output->writeln(" <comment>OK</comment>");
-
         $output->write("Validating plugin...");
-        $manifest = $this->container['plugins.plugins-validator']->validatePlugin($temporaryDir);
+        $manifest = $this->container['plugins.plugins-validator']->validatePlugin($source);
         $output->writeln(" <comment>OK</comment> found <info>".$manifest->getName()."</info>");
 
         $targetDir  = $this->container['plugin.path'] . DIRECTORY_SEPARATOR . $manifest->getName();
+        if (normalizePath($targetDir) !== normalizePath($source)) {
+            $temporaryDir = $this->container['temporary-filesystem']->createTemporaryDirectory();
+            $output->write("Importing <info>$source</info>...");
+            $this->container['plugins.importer']->import($source, $temporaryDir);
+            $output->writeln(" <comment>OK</comment>");
+            $workingDir = $temporaryDir;
+        } else {
+            $workingDir = $targetDir;
+        }
 
-        $output->write("Setting up composer...");
-        $this->container['plugins.composer-installer']->install($temporaryDir);
-        $output->writeln(" <comment>OK</comment>");
+        if (!is_dir($workingDir.'/vendor')) {
+            $output->write("Setting up composer...");
+            $this->container['plugins.composer-installer']->install($workingDir);
+            $output->writeln(" <comment>OK</comment>");
+        }
 
         $output->write("Installing plugin <info>".$manifest->getName()."</info>...");
-        $this->container['filesystem']->mirror($temporaryDir, $targetDir);
+        if (isset($temporaryDir)) {
+            $this->container['filesystem']->mirror($temporaryDir, $targetDir);
+        }
         $output->writeln(" <comment>OK</comment>");
 
         $output->write("Copying public files <info>".$manifest->getName()."</info>...");
         $this->container['plugins.assets-manager']->update($manifest);
         $output->writeln(" <comment>OK</comment>");
 
-        $output->write("Removing temporary directory...");
-        $this->container['filesystem']->remove($temporaryDir);
-        $output->writeln(" <comment>OK</comment>");
+        if (isset($temporaryDir)) {
+            $output->write("Removing temporary directory...");
+            $this->container['filesystem']->remove($temporaryDir);
+            $output->writeln(" <comment>OK</comment>");
+        }
 
         $output->write("Activating plugin...");
         $this->container['conf']->set(['plugins', $manifest->getName(), 'enabled'], true);
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
index 6e650aefaa..c9726d5faf 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
@@ -98,7 +98,7 @@ class PushController extends Controller
                 $Basket->setUser($user_receiver);
                 $Basket->setPusher($this->getAuthenticatedUser());
                 $Basket->markUnread();
-                
+
                 $manager->persist($Basket);
 
                 foreach ($pusher->get_elements() as $element) {
@@ -600,6 +600,38 @@ class PushController extends Controller
         );
     }
 
+    public function updateExpirationAction(Request $request)
+    {
+        $ret = [
+            'success' => false,
+            'message' => $this->app->trans('Unable to save the expiration date')
+        ];
+        if (is_null($request->request->get('date'))) {
+            $ret['message'] = $this->app->trans('The provided date is null!');
+            return $this->app->json($ret);
+        }
+        $repository = $this->app['repo.baskets'];
+        $manager = $this->getEntityManager();
+        $manager->beginTransaction();
+        try {
+            $basket = $repository->findUserBasket($request->request->get('basket_id'), $this->app->getAuthenticatedUser(), true);
+            $date = new \DateTime($request->request->get('date') . " 23:59:59");
+            $validation = $basket->getValidation();
+            if (is_null($validation)) {
+                return $this->app->json($ret);
+            }
+            $validation->setExpires($date);
+            $manager->persist($validation);
+            $manager->flush();
+            $manager->commit();
+            $ret['message'] = $this->app->trans('Expiration date successfully updated!');
+        } catch (\Exception $e) {
+            $ret['message'] = $e->getMessage();
+            $manager->rollback();
+        }
+        return $this->app->json($ret);
+    }
+
     private function formatUser(User $user)
     {
         $subtitle = array_filter([$user->getJob(), $user->getCompany()]);
@@ -734,4 +766,5 @@ class PushController extends Controller
     {
         return $this->app['random.medium'];
     }
+
 }
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
index 48352e1e39..40b93220c0 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Push.php
@@ -59,6 +59,9 @@ class Push implements ControllerProviderInterface, ServiceProviderInterface
         $controllers->post('/validate/', 'controller.prod.push:validateAction')
             ->bind('prod_push_validate');
 
+        $controllers->post('/update-expiration/', 'controller.prod.push:updateExpirationAction')
+            ->bind('prod_push_do_update_expiration');
+
         $controllers->get('/user/{usr_id}/', 'controller.prod.push:getUserAction')
             ->assert('usr_id', '\d+');
 
diff --git a/lib/classes/phraseadate.php b/lib/classes/phraseadate.php
index 6acca8b75f..a9732e7822 100644
--- a/lib/classes/phraseadate.php
+++ b/lib/classes/phraseadate.php
@@ -120,6 +120,16 @@ class phraseadate
         }
     }
 
+    public function getTranslatedDate(DateTime $date = null)
+    {
+        $fmt = new IntlDateFormatter(
+            $this->app['locale'] ?: 'en',
+            NULL, NULL, NULL, NULL, 'dd MMMM yyyy'
+        );
+
+        return $fmt->format($date);
+    }
+
     /**
      *
      * @param  DateTime $date
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 9ca23ed2d7..8972dae59c 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:24Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:44:42Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -192,8 +192,9 @@
       <trans-unit id="24c43d6925295b9738f6fe69e4fb3dc7a2030f0f" resname="%nb_records% records" approved="yes">
         <source>%nb_records% records</source>
         <target state="translated">%nb_records% Datensätze</target>
+        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="14">prod/Tooltip/Story.html.twig</jms:reference-file>
-        <jms:reference-file line="25">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="29">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e39dc3a90b0674916ef22f19912638564f33e518" resname="%nb_view% vue" approved="yes">
         <source>%nb_view% vue</source>
@@ -1689,7 +1690,7 @@
       <trans-unit id="3f2e437119fb80c64e6a9c7fff66c4160856dc40" resname="Certaines donnees du panier ont change" approved="yes">
         <source>Certaines donnees du panier ont change</source>
         <target state="translated">Einige Daten des Sammelkorbs wurden verändert</target>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="3062356beeb0f20cb9418d55769ea256059d611e" resname="Certaines donnees du reportage ont change" approved="yes">
         <source>Certaines donnees du reportage ont change</source>
@@ -3165,6 +3166,11 @@
         <target state="translated">Einstellungen von ausführbaren Programme</target>
         <jms:reference-file line="58">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="7e4ab5feaafcefe0d6fa300a11dfc921f12b5a40" resname="Expiration date successfully updated!">
+        <source>Expiration date successfully updated!</source>
+        <target state="new">Expiration date successfully updated!</target>
+        <jms:reference-file line="627">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="f3e4fadb9e370a1e2c0c622c01fc8c77daf93a2c" resname="Export" approved="yes">
         <source>Export</source>
         <target state="translated">Exportieren</target>
@@ -6685,6 +6691,11 @@
         <target state="translated">Die folgende Fehler wurden festgestellt</target>
         <jms:reference-file line="5">user/import/view.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="99d8c6d419ad0732e7d87098c3f60b62f2316e61" resname="The provided date is null!">
+        <source>The provided date is null!</source>
+        <target state="new">The provided date is null!</target>
+        <jms:reference-file line="610">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="d22c09c164965d42fcdb8d8fe2b40d7d57799a8f" resname="The publication has been stopped" approved="yes">
         <source>The publication has been stopped</source>
         <target state="translated">Veröffentlichung wurde gestoppt</target>
@@ -7046,6 +7057,11 @@
         <jms:reference-file line="678">Controller/Root/LoginController.php</jms:reference-file>
         <jms:reference-file line="224">Controller/Api/OAuth2Controller.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="c35e31f5dafff1fdd756af111f7699abf3a5ffd0" resname="Unable to save the expiration date">
+        <source>Unable to save the expiration date</source>
+        <target state="new">Unable to save the expiration date</target>
+        <jms:reference-file line="607">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6af8293be2ccc7fc664c96b11293a226fd300026" resname="Unable to send the documents" approved="yes">
         <source>Unable to send the documents</source>
         <target state="translated">Es ist nicht möglich Dokumente zu senden</target>
@@ -11718,7 +11734,13 @@
       <trans-unit id="6024f9d9ecbc9b6e3b531d630df53f92235a8497" resname="prod:workzone:basket:creation-date">
         <source>prod:workzone:basket:creation-date</source>
         <target state="new">prod:workzone:basket:creation-date</target>
-        <jms:reference-file line="26">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="98">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="30">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="5f352a91ba9ba55245e244f3834ec906c27b1378" resname="prod:workzone:basket:updated-message">
+        <source>prod:workzone:basket:updated-message</source>
+        <target state="new">prod:workzone:basket:updated-message</target>
+        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="052118f44df2bb35620741b7efe68fd84f77e2ef" resname="prod:workzone:facetstab:search_and_facets_sort_options">
         <source>prod:workzone:facetstab:search_and_facets_sort_options</source>
@@ -11826,7 +11848,7 @@
         <target state="translated">Aktualisieren</target>
         <jms:reference-file line="89">prod/WorkZone/Story.html.twig</jms:reference-file>
         <jms:reference-file line="3">prod/WorkZone/Macros.html.twig</jms:reference-file>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="17">prod/results/feeds.html.twig</jms:reference-file>
         <jms:reference-file line="22">prod/results/feeds.html.twig</jms:reference-file>
       </trans-unit>
@@ -13397,128 +13419,134 @@
       <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april">
         <source>workzone:datepicker:april</source>
         <target state="new">workzone:datepicker:april</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august">
         <source>workzone:datepicker:august</source>
         <target state="new">workzone:datepicker:august</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="63c83f397c51202a27320349456ec75b844a75e6" resname="workzone:datepicker:closeText">
         <source>workzone:datepicker:closeText</source>
         <target state="new">workzone:datepicker:closeText</target>
-        <jms:reference-file line="110">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="165">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="32037015798672f75f469624c847da64e5953a27" resname="workzone:datepicker:currentText">
         <source>workzone:datepicker:currentText</source>
         <target state="new">workzone:datepicker:currentText</target>
-        <jms:reference-file line="113">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="168">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december">
         <source>workzone:datepicker:december</source>
         <target state="new">workzone:datepicker:december</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february">
         <source>workzone:datepicker:february</source>
         <target state="new">workzone:datepicker:february</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday">
         <source>workzone:datepicker:friday</source>
         <target state="new">workzone:datepicker:friday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january">
         <source>workzone:datepicker:january</source>
         <target state="new">workzone:datepicker:january</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july">
         <source>workzone:datepicker:july</source>
         <target state="new">workzone:datepicker:july</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june">
         <source>workzone:datepicker:june</source>
         <target state="new">workzone:datepicker:june</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march">
         <source>workzone:datepicker:march</source>
         <target state="new">workzone:datepicker:march</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may">
         <source>workzone:datepicker:may</source>
         <target state="new">workzone:datepicker:may</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday">
         <source>workzone:datepicker:monday</source>
         <target state="new">workzone:datepicker:monday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0bbaf1d4dbaa3b5eb27154fcc9579f89c848b091" resname="workzone:datepicker:nextText">
         <source>workzone:datepicker:nextText</source>
         <target state="new">workzone:datepicker:nextText</target>
-        <jms:reference-file line="112">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="167">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november">
         <source>workzone:datepicker:november</source>
         <target state="new">workzone:datepicker:november</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october">
         <source>workzone:datepicker:october</source>
         <target state="new">workzone:datepicker:october</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7eef21d25b8fa0b6940fe6c87640f82612d0393f" resname="workzone:datepicker:prevText">
         <source>workzone:datepicker:prevText</source>
         <target state="new">workzone:datepicker:prevText</target>
-        <jms:reference-file line="111">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="166">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday">
         <source>workzone:datepicker:saturday</source>
         <target state="new">workzone:datepicker:saturday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september">
         <source>workzone:datepicker:september</source>
         <target state="new">workzone:datepicker:september</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday">
         <source>workzone:datepicker:sunday</source>
         <target state="new">workzone:datepicker:sunday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday">
         <source>workzone:datepicker:thursday</source>
         <target state="new">workzone:datepicker:thursday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday">
         <source>workzone:datepicker:tuesday</source>
         <target state="new">workzone:datepicker:tuesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday">
         <source>workzone:datepicker:wednesday</source>
         <target state="new">workzone:datepicker:wednesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a272c87e7e6d13003b19b8b8169847c9c2fe8ef0" resname="workzone:feedback:expiration">
-        <source>workzone:feedback:expiration</source>
-        <target state="new">workzone:feedback:expiration</target>
-        <jms:reference-file line="95">prod/WorkZone/Basket.html.twig</jms:reference-file>
-        <jms:reference-file line="14">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      <trans-unit id="cbfb58c29147c5881e828d18a477f922211873a0" resname="workzone:feedback:expiration-closed">
+        <source>workzone:feedback:expiration-closed</source>
+        <target state="new">workzone:feedback:expiration-closed</target>
+        <jms:reference-file line="105">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="15">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="32285b1e113decb0a3fdf090b0698c5508a2bd09" resname="workzone:feedback:expiration-open">
+        <source>workzone:feedback:expiration-open</source>
+        <target state="new">workzone:feedback:expiration-open</target>
+        <jms:reference-file line="107">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="17">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2f0e2fbacaf98478f0a46f828495e0dac8772a32" resname="workzone:feedback:update">
         <source>workzone:feedback:update</source>
         <target state="new">workzone:feedback:update</target>
-        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0" resname="yes" approved="yes">
         <source>yes</source>
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 95c032bf88..4c9560d4e9 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:35Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:44:55Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -192,8 +192,9 @@
       <trans-unit id="24c43d6925295b9738f6fe69e4fb3dc7a2030f0f" resname="%nb_records% records" approved="yes">
         <source>%nb_records% records</source>
         <target state="translated">%nb_records% records</target>
+        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="14">prod/Tooltip/Story.html.twig</jms:reference-file>
-        <jms:reference-file line="25">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="29">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e39dc3a90b0674916ef22f19912638564f33e518" resname="%nb_view% vue" approved="yes">
         <source>%nb_view% vue</source>
@@ -1690,7 +1691,7 @@
       <trans-unit id="3f2e437119fb80c64e6a9c7fff66c4160856dc40" resname="Certaines donnees du panier ont change" approved="yes">
         <source>Certaines donnees du panier ont change</source>
         <target state="translated">This basket has been updated</target>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="3062356beeb0f20cb9418d55769ea256059d611e" resname="Certaines donnees du reportage ont change" approved="yes">
         <source>Certaines donnees du reportage ont change</source>
@@ -3168,6 +3169,11 @@
         <target state="translated">Executables setting</target>
         <jms:reference-file line="58">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="7e4ab5feaafcefe0d6fa300a11dfc921f12b5a40" resname="Expiration date successfully updated!">
+        <source>Expiration date successfully updated!</source>
+        <target state="new">Expiration date successfully updated!</target>
+        <jms:reference-file line="627">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="f3e4fadb9e370a1e2c0c622c01fc8c77daf93a2c" resname="Export" approved="yes">
         <source>Export</source>
         <target state="translated">Export</target>
@@ -6688,6 +6694,11 @@
         <target state="translated">The following errors have been detected</target>
         <jms:reference-file line="5">user/import/view.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="99d8c6d419ad0732e7d87098c3f60b62f2316e61" resname="The provided date is null!">
+        <source>The provided date is null!</source>
+        <target state="new">The provided date is null!</target>
+        <jms:reference-file line="610">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="d22c09c164965d42fcdb8d8fe2b40d7d57799a8f" resname="The publication has been stopped" approved="yes">
         <source>The publication has been stopped</source>
         <target state="translated">The publication has been stopped.</target>
@@ -7049,6 +7060,11 @@
         <jms:reference-file line="678">Controller/Root/LoginController.php</jms:reference-file>
         <jms:reference-file line="224">Controller/Api/OAuth2Controller.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="c35e31f5dafff1fdd756af111f7699abf3a5ffd0" resname="Unable to save the expiration date">
+        <source>Unable to save the expiration date</source>
+        <target state="new">Unable to save the expiration date</target>
+        <jms:reference-file line="607">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6af8293be2ccc7fc664c96b11293a226fd300026" resname="Unable to send the documents" approved="yes">
         <source>Unable to send the documents</source>
         <target state="translated">Unable to send the documents</target>
@@ -11723,8 +11739,14 @@ It is possible to place several search areas</target>
       </trans-unit>
       <trans-unit id="6024f9d9ecbc9b6e3b531d630df53f92235a8497" resname="prod:workzone:basket:creation-date">
         <source>prod:workzone:basket:creation-date</source>
-        <target state="new">prod:workzone:basket:creation-date</target>
-        <jms:reference-file line="26">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Creation</target>
+        <jms:reference-file line="98">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="30">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="5f352a91ba9ba55245e244f3834ec906c27b1378" resname="prod:workzone:basket:updated-message">
+        <source>prod:workzone:basket:updated-message</source>
+        <target state="new">prod:workzone:basket:updated-message</target>
+        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="052118f44df2bb35620741b7efe68fd84f77e2ef" resname="prod:workzone:facetstab:search_and_facets_sort_options">
         <source>prod:workzone:facetstab:search_and_facets_sort_options</source>
@@ -11832,7 +11854,7 @@ It is possible to place several search areas</target>
         <target state="translated">Refresh</target>
         <jms:reference-file line="89">prod/WorkZone/Story.html.twig</jms:reference-file>
         <jms:reference-file line="3">prod/WorkZone/Macros.html.twig</jms:reference-file>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="17">prod/results/feeds.html.twig</jms:reference-file>
         <jms:reference-file line="22">prod/results/feeds.html.twig</jms:reference-file>
       </trans-unit>
@@ -13400,131 +13422,137 @@ It is possible to place several search areas</target>
         <target state="translated">Thumbnail Tools</target>
         <jms:reference-file line="24">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april">
+      <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april" approved="yes">
         <source>workzone:datepicker:april</source>
-        <target state="new">workzone:datepicker:april</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">April</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august">
+      <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august" approved="yes">
         <source>workzone:datepicker:august</source>
-        <target state="new">workzone:datepicker:august</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">August</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="63c83f397c51202a27320349456ec75b844a75e6" resname="workzone:datepicker:closeText">
         <source>workzone:datepicker:closeText</source>
         <target state="new">workzone:datepicker:closeText</target>
-        <jms:reference-file line="110">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="165">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="32037015798672f75f469624c847da64e5953a27" resname="workzone:datepicker:currentText">
         <source>workzone:datepicker:currentText</source>
         <target state="new">workzone:datepicker:currentText</target>
-        <jms:reference-file line="113">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="168">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december">
+      <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december" approved="yes">
         <source>workzone:datepicker:december</source>
-        <target state="new">workzone:datepicker:december</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">December</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february">
+      <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february" approved="yes">
         <source>workzone:datepicker:february</source>
-        <target state="new">workzone:datepicker:february</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">February</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday">
+      <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday" approved="yes">
         <source>workzone:datepicker:friday</source>
-        <target state="new">workzone:datepicker:friday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Friday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january">
+      <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january" approved="yes">
         <source>workzone:datepicker:january</source>
-        <target state="new">workzone:datepicker:january</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">January</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july">
+      <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july" approved="yes">
         <source>workzone:datepicker:july</source>
-        <target state="new">workzone:datepicker:july</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">July</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june">
+      <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june" approved="yes">
         <source>workzone:datepicker:june</source>
-        <target state="new">workzone:datepicker:june</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">June</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march">
+      <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march" approved="yes">
         <source>workzone:datepicker:march</source>
-        <target state="new">workzone:datepicker:march</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">March</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may">
+      <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may" approved="yes">
         <source>workzone:datepicker:may</source>
-        <target state="new">workzone:datepicker:may</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">May</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday">
+      <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday" approved="yes">
         <source>workzone:datepicker:monday</source>
-        <target state="new">workzone:datepicker:monday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Monday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0bbaf1d4dbaa3b5eb27154fcc9579f89c848b091" resname="workzone:datepicker:nextText">
         <source>workzone:datepicker:nextText</source>
-        <target state="new">workzone:datepicker:nextText</target>
-        <jms:reference-file line="112">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Next</target>
+        <jms:reference-file line="167">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november">
+      <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november" approved="yes">
         <source>workzone:datepicker:november</source>
-        <target state="new">workzone:datepicker:november</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">November</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october">
+      <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october" approved="yes">
         <source>workzone:datepicker:october</source>
-        <target state="new">workzone:datepicker:october</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">October</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7eef21d25b8fa0b6940fe6c87640f82612d0393f" resname="workzone:datepicker:prevText">
         <source>workzone:datepicker:prevText</source>
-        <target state="new">workzone:datepicker:prevText</target>
-        <jms:reference-file line="111">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Previous</target>
+        <jms:reference-file line="166">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday">
+      <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday" approved="yes">
         <source>workzone:datepicker:saturday</source>
-        <target state="new">workzone:datepicker:saturday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Saturday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september">
+      <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september" approved="yes">
         <source>workzone:datepicker:september</source>
-        <target state="new">workzone:datepicker:september</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">September</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday">
+      <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday" approved="yes">
         <source>workzone:datepicker:sunday</source>
-        <target state="new">workzone:datepicker:sunday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Sunday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday">
+      <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday" approved="yes">
         <source>workzone:datepicker:thursday</source>
-        <target state="new">workzone:datepicker:thursday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Thursday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday">
+      <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday" approved="yes">
         <source>workzone:datepicker:tuesday</source>
-        <target state="new">workzone:datepicker:tuesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Tuesday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday">
+      <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday" approved="yes">
         <source>workzone:datepicker:wednesday</source>
-        <target state="new">workzone:datepicker:wednesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Wednesday</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a272c87e7e6d13003b19b8b8169847c9c2fe8ef0" resname="workzone:feedback:expiration">
-        <source>workzone:feedback:expiration</source>
-        <target state="needs-translation">Feedback open Until</target>
-        <jms:reference-file line="95">prod/WorkZone/Basket.html.twig</jms:reference-file>
-        <jms:reference-file line="14">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      <trans-unit id="cbfb58c29147c5881e828d18a477f922211873a0" resname="workzone:feedback:expiration-closed">
+        <source>workzone:feedback:expiration-closed</source>
+        <target state="new">workzone:feedback:expiration-closed</target>
+        <jms:reference-file line="105">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="15">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="32285b1e113decb0a3fdf090b0698c5508a2bd09" resname="workzone:feedback:expiration-open">
+        <source>workzone:feedback:expiration-open</source>
+        <target state="new">workzone:feedback:expiration-open</target>
+        <jms:reference-file line="107">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="17">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2f0e2fbacaf98478f0a46f828495e0dac8772a32" resname="workzone:feedback:update">
         <source>workzone:feedback:update</source>
-        <target state="new">workzone:feedback:update</target>
-        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Update Date</target>
+        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0" resname="yes" approved="yes">
         <source>yes</source>
diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 1b43accabe..be1a6c9a97 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:47Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:45:08Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -192,8 +192,9 @@
       <trans-unit id="24c43d6925295b9738f6fe69e4fb3dc7a2030f0f" resname="%nb_records% records" approved="yes">
         <source>%nb_records% records</source>
         <target state="translated">%nb_records% enregistrement(s)</target>
+        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="14">prod/Tooltip/Story.html.twig</jms:reference-file>
-        <jms:reference-file line="25">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="29">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e39dc3a90b0674916ef22f19912638564f33e518" resname="%nb_view% vue" approved="yes">
         <source>%nb_view% vue</source>
@@ -1689,7 +1690,7 @@
       <trans-unit id="3f2e437119fb80c64e6a9c7fff66c4160856dc40" resname="Certaines donnees du panier ont change" approved="yes">
         <source>Certaines donnees du panier ont change</source>
         <target state="translated">Certaines données du panier ont changé</target>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="3062356beeb0f20cb9418d55769ea256059d611e" resname="Certaines donnees du reportage ont change" approved="yes">
         <source>Certaines donnees du reportage ont change</source>
@@ -3165,6 +3166,11 @@
         <target state="translated">Paramètres d'exécutables</target>
         <jms:reference-file line="58">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="7e4ab5feaafcefe0d6fa300a11dfc921f12b5a40" resname="Expiration date successfully updated!">
+        <source>Expiration date successfully updated!</source>
+        <target state="new">Expiration date successfully updated!</target>
+        <jms:reference-file line="627">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="f3e4fadb9e370a1e2c0c622c01fc8c77daf93a2c" resname="Export" approved="yes">
         <source>Export</source>
         <target state="translated">Exporter</target>
@@ -6687,6 +6693,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
         <target state="translated">Les erreurs suivantes ont été détectées.</target>
         <jms:reference-file line="5">user/import/view.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="99d8c6d419ad0732e7d87098c3f60b62f2316e61" resname="The provided date is null!">
+        <source>The provided date is null!</source>
+        <target state="new">The provided date is null!</target>
+        <jms:reference-file line="610">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="d22c09c164965d42fcdb8d8fe2b40d7d57799a8f" resname="The publication has been stopped" approved="yes">
         <source>The publication has been stopped</source>
         <target state="translated">La publication a été suspendue</target>
@@ -7048,6 +7059,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
         <jms:reference-file line="678">Controller/Root/LoginController.php</jms:reference-file>
         <jms:reference-file line="224">Controller/Api/OAuth2Controller.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="c35e31f5dafff1fdd756af111f7699abf3a5ffd0" resname="Unable to save the expiration date">
+        <source>Unable to save the expiration date</source>
+        <target state="new">Unable to save the expiration date</target>
+        <jms:reference-file line="607">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6af8293be2ccc7fc664c96b11293a226fd300026" resname="Unable to send the documents" approved="yes">
         <source>Unable to send the documents</source>
         <target state="translated">Impossible d'envoyer les documents</target>
@@ -10058,14 +10074,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <target state="translated">Facettes masquées</target>
         <jms:reference-file line="878">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits">
+      <trans-unit id="4a35cc75d1072f7dad99c8e91596298f55f20a54" resname="index::advance_search: order-by-hits" approved="yes">
         <source>index::advance_search: order-by-hits</source>
-        <target state="needs-translation">Par occurrences</target>
+        <target state="translated">Par occurrences</target>
         <jms:reference-file line="224">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="6f4d2da6c513e72ef9e2daec0b695116a26e7912" resname="index::advance_search: order-by-hits-asc">
+      <trans-unit id="6f4d2da6c513e72ef9e2daec0b695116a26e7912" resname="index::advance_search: order-by-hits-asc" approved="yes">
         <source>index::advance_search: order-by-hits-asc</source>
-        <target state="needs-translation">Par occurrences asc</target>
+        <target state="translated">Par occurrences asc</target>
         <jms:reference-file line="226">web/prod/index.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="1039a002699408da4c4fe74638a6b44f60499069" resname="index:advanced-preferences:: use truncation" approved="yes">
@@ -11726,8 +11742,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       </trans-unit>
       <trans-unit id="6024f9d9ecbc9b6e3b531d630df53f92235a8497" resname="prod:workzone:basket:creation-date">
         <source>prod:workzone:basket:creation-date</source>
-        <target state="new">prod:workzone:basket:creation-date</target>
-        <jms:reference-file line="26">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Date de création</target>
+        <jms:reference-file line="98">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="30">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="5f352a91ba9ba55245e244f3834ec906c27b1378" resname="prod:workzone:basket:updated-message">
+        <source>prod:workzone:basket:updated-message</source>
+        <target state="new">prod:workzone:basket:updated-message</target>
+        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="052118f44df2bb35620741b7efe68fd84f77e2ef" resname="prod:workzone:facetstab:search_and_facets_sort_options" approved="yes">
         <source>prod:workzone:facetstab:search_and_facets_sort_options</source>
@@ -11835,7 +11857,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <target state="translated">Rafraîchir</target>
         <jms:reference-file line="89">prod/WorkZone/Story.html.twig</jms:reference-file>
         <jms:reference-file line="3">prod/WorkZone/Macros.html.twig</jms:reference-file>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="17">prod/results/feeds.html.twig</jms:reference-file>
         <jms:reference-file line="22">prod/results/feeds.html.twig</jms:reference-file>
       </trans-unit>
@@ -13403,131 +13425,137 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
         <target state="translated">Outils vidéos</target>
         <jms:reference-file line="24">actions/Tools/videoEditor.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april">
+      <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april" approved="yes">
         <source>workzone:datepicker:april</source>
-        <target state="new">workzone:datepicker:april</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Avril</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august">
+      <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august" approved="yes">
         <source>workzone:datepicker:august</source>
-        <target state="new">workzone:datepicker:august</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Aout</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="63c83f397c51202a27320349456ec75b844a75e6" resname="workzone:datepicker:closeText">
         <source>workzone:datepicker:closeText</source>
-        <target state="new">workzone:datepicker:closeText</target>
-        <jms:reference-file line="110">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Clore</target>
+        <jms:reference-file line="165">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="32037015798672f75f469624c847da64e5953a27" resname="workzone:datepicker:currentText">
         <source>workzone:datepicker:currentText</source>
-        <target state="new">workzone:datepicker:currentText</target>
-        <jms:reference-file line="113">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">courant</target>
+        <jms:reference-file line="168">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december">
+      <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december" approved="yes">
         <source>workzone:datepicker:december</source>
-        <target state="new">workzone:datepicker:december</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Décembre</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february">
+      <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february" approved="yes">
         <source>workzone:datepicker:february</source>
-        <target state="new">workzone:datepicker:february</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Février</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday">
+      <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday" approved="yes">
         <source>workzone:datepicker:friday</source>
-        <target state="new">workzone:datepicker:friday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Vendredi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january">
+      <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january" approved="yes">
         <source>workzone:datepicker:january</source>
-        <target state="new">workzone:datepicker:january</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Janvier</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july">
+      <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july" approved="yes">
         <source>workzone:datepicker:july</source>
-        <target state="new">workzone:datepicker:july</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Juillet</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june">
+      <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june" approved="yes">
         <source>workzone:datepicker:june</source>
-        <target state="new">workzone:datepicker:june</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Juin</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march">
+      <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march" approved="yes">
         <source>workzone:datepicker:march</source>
-        <target state="new">workzone:datepicker:march</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Mars</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may">
+      <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may" approved="yes">
         <source>workzone:datepicker:may</source>
-        <target state="new">workzone:datepicker:may</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Mai</target>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday">
+      <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday" approved="yes">
         <source>workzone:datepicker:monday</source>
-        <target state="new">workzone:datepicker:monday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Lundi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0bbaf1d4dbaa3b5eb27154fcc9579f89c848b091" resname="workzone:datepicker:nextText">
         <source>workzone:datepicker:nextText</source>
-        <target state="new">workzone:datepicker:nextText</target>
-        <jms:reference-file line="112">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Suivant</target>
+        <jms:reference-file line="167">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november">
+      <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november" approved="yes">
         <source>workzone:datepicker:november</source>
-        <target state="new">workzone:datepicker:november</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Novembre</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october">
+      <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october" approved="yes">
         <source>workzone:datepicker:october</source>
-        <target state="new">workzone:datepicker:october</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Octobre</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7eef21d25b8fa0b6940fe6c87640f82612d0393f" resname="workzone:datepicker:prevText">
         <source>workzone:datepicker:prevText</source>
-        <target state="new">workzone:datepicker:prevText</target>
-        <jms:reference-file line="111">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Précédent</target>
+        <jms:reference-file line="166">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday">
+      <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday" approved="yes">
         <source>workzone:datepicker:saturday</source>
-        <target state="new">workzone:datepicker:saturday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Samedi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september">
+      <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september" approved="yes">
         <source>workzone:datepicker:september</source>
-        <target state="new">workzone:datepicker:september</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Septembre</target>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday">
+      <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday" approved="yes">
         <source>workzone:datepicker:sunday</source>
-        <target state="new">workzone:datepicker:sunday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Dimanche</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday">
+      <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday" approved="yes">
         <source>workzone:datepicker:thursday</source>
-        <target state="new">workzone:datepicker:thursday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Jeudi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday">
+      <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday" approved="yes">
         <source>workzone:datepicker:tuesday</source>
-        <target state="new">workzone:datepicker:tuesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Mardi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday">
+      <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday" approved="yes">
         <source>workzone:datepicker:wednesday</source>
-        <target state="new">workzone:datepicker:wednesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="translated">Mercredi</target>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a272c87e7e6d13003b19b8b8169847c9c2fe8ef0" resname="workzone:feedback:expiration">
-        <source>workzone:feedback:expiration</source>
-        <target state="needs-translation">Validation ouverte jusqu'au</target>
-        <jms:reference-file line="95">prod/WorkZone/Basket.html.twig</jms:reference-file>
-        <jms:reference-file line="14">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      <trans-unit id="cbfb58c29147c5881e828d18a477f922211873a0" resname="workzone:feedback:expiration-closed">
+        <source>workzone:feedback:expiration-closed</source>
+        <target state="new">workzone:feedback:expiration-closed</target>
+        <jms:reference-file line="105">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="15">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="32285b1e113decb0a3fdf090b0698c5508a2bd09" resname="workzone:feedback:expiration-open">
+        <source>workzone:feedback:expiration-open</source>
+        <target state="new">workzone:feedback:expiration-open</target>
+        <jms:reference-file line="107">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="17">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2f0e2fbacaf98478f0a46f828495e0dac8772a32" resname="workzone:feedback:update">
         <source>workzone:feedback:update</source>
-        <target state="new">workzone:feedback:update</target>
-        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <target state="needs-translation">Valider</target>
+        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0" resname="yes" approved="yes">
         <source>yes</source>
diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf
index c61524de6a..d5fff61be3 100644
--- a/resources/locales/messages.nl.xlf
+++ b/resources/locales/messages.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:07:03Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:45:26Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -196,8 +196,9 @@
       <trans-unit id="24c43d6925295b9738f6fe69e4fb3dc7a2030f0f" resname="%nb_records% records">
         <source>%nb_records% records</source>
         <target>%nb_records% records</target>
+        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="14">prod/Tooltip/Story.html.twig</jms:reference-file>
-        <jms:reference-file line="25">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="29">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="e39dc3a90b0674916ef22f19912638564f33e518" resname="%nb_view% vue" approved="yes">
         <source>%nb_view% vue</source>
@@ -1694,7 +1695,7 @@
       <trans-unit id="3f2e437119fb80c64e6a9c7fff66c4160856dc40" resname="Certaines donnees du panier ont change" approved="yes">
         <source>Certaines donnees du panier ont change</source>
         <target state="translated">Sommige gegevens in het mandje zijn veranderd</target>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="3062356beeb0f20cb9418d55769ea256059d611e" resname="Certaines donnees du reportage ont change" approved="yes">
         <source>Certaines donnees du reportage ont change</source>
@@ -3175,6 +3176,11 @@
         <target state="translated">Executables instellingen</target>
         <jms:reference-file line="58">Form/Configuration/MainConfigurationFormType.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="7e4ab5feaafcefe0d6fa300a11dfc921f12b5a40" resname="Expiration date successfully updated!">
+        <source>Expiration date successfully updated!</source>
+        <target state="new">Expiration date successfully updated!</target>
+        <jms:reference-file line="627">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="f3e4fadb9e370a1e2c0c622c01fc8c77daf93a2c" resname="Export" approved="yes">
         <source>Export</source>
         <target state="translated">Exporteer</target>
@@ -6695,6 +6701,11 @@
         <target state="translated">De volgende fouten werden opgemerkt</target>
         <jms:reference-file line="5">user/import/view.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="99d8c6d419ad0732e7d87098c3f60b62f2316e61" resname="The provided date is null!">
+        <source>The provided date is null!</source>
+        <target state="new">The provided date is null!</target>
+        <jms:reference-file line="610">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="d22c09c164965d42fcdb8d8fe2b40d7d57799a8f" resname="The publication has been stopped" approved="yes">
         <source>The publication has been stopped</source>
         <target state="translated">Het programma is gestopt</target>
@@ -7056,6 +7067,11 @@
         <jms:reference-file line="678">Controller/Root/LoginController.php</jms:reference-file>
         <jms:reference-file line="224">Controller/Api/OAuth2Controller.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="c35e31f5dafff1fdd756af111f7699abf3a5ffd0" resname="Unable to save the expiration date">
+        <source>Unable to save the expiration date</source>
+        <target state="new">Unable to save the expiration date</target>
+        <jms:reference-file line="607">Controller/Prod/PushController.php</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6af8293be2ccc7fc664c96b11293a226fd300026" resname="Unable to send the documents" approved="yes">
         <source>Unable to send the documents</source>
         <target state="translated">Documenten kunnen niet worden verstuurd</target>
@@ -11728,7 +11744,13 @@
       <trans-unit id="6024f9d9ecbc9b6e3b531d630df53f92235a8497" resname="prod:workzone:basket:creation-date">
         <source>prod:workzone:basket:creation-date</source>
         <target state="new">prod:workzone:basket:creation-date</target>
-        <jms:reference-file line="26">prod/Tooltip/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="98">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="30">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="5f352a91ba9ba55245e244f3834ec906c27b1378" resname="prod:workzone:basket:updated-message">
+        <source>prod:workzone:basket:updated-message</source>
+        <target state="new">prod:workzone:basket:updated-message</target>
+        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="052118f44df2bb35620741b7efe68fd84f77e2ef" resname="prod:workzone:facetstab:search_and_facets_sort_options">
         <source>prod:workzone:facetstab:search_and_facets_sort_options</source>
@@ -11836,7 +11858,7 @@
         <target state="translated">vernieuwen</target>
         <jms:reference-file line="89">prod/WorkZone/Story.html.twig</jms:reference-file>
         <jms:reference-file line="3">prod/WorkZone/Macros.html.twig</jms:reference-file>
-        <jms:reference-file line="132">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="123">prod/WorkZone/Basket.html.twig</jms:reference-file>
         <jms:reference-file line="17">prod/results/feeds.html.twig</jms:reference-file>
         <jms:reference-file line="22">prod/results/feeds.html.twig</jms:reference-file>
       </trans-unit>
@@ -13407,128 +13429,134 @@
       <trans-unit id="ecbe1590a62c751a6bafe631fc5d05158d0962b4" resname="workzone:datepicker:april">
         <source>workzone:datepicker:april</source>
         <target state="new">workzone:datepicker:april</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="23ed9061fbf1a184658e05e57a121a72474b54eb" resname="workzone:datepicker:august">
         <source>workzone:datepicker:august</source>
         <target state="new">workzone:datepicker:august</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="63c83f397c51202a27320349456ec75b844a75e6" resname="workzone:datepicker:closeText">
         <source>workzone:datepicker:closeText</source>
         <target state="new">workzone:datepicker:closeText</target>
-        <jms:reference-file line="110">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="165">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="32037015798672f75f469624c847da64e5953a27" resname="workzone:datepicker:currentText">
         <source>workzone:datepicker:currentText</source>
         <target state="new">workzone:datepicker:currentText</target>
-        <jms:reference-file line="113">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="168">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7e55bc758f272d38198385584d6f50c2dd0eae13" resname="workzone:datepicker:december">
         <source>workzone:datepicker:december</source>
         <target state="new">workzone:datepicker:december</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="db178b383e47bbe58670afd6a67528a4712444d7" resname="workzone:datepicker:february">
         <source>workzone:datepicker:february</source>
         <target state="new">workzone:datepicker:february</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a4e3f12ef1defef487381a8339ea49840666414a" resname="workzone:datepicker:friday">
         <source>workzone:datepicker:friday</source>
         <target state="new">workzone:datepicker:friday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="93f6bd6902114b73c225005188bce87569a3ac9c" resname="workzone:datepicker:january">
         <source>workzone:datepicker:january</source>
         <target state="new">workzone:datepicker:january</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0f1d297c3d3d9bc7cd800a9bd1a938904f4440ab" resname="workzone:datepicker:july">
         <source>workzone:datepicker:july</source>
         <target state="new">workzone:datepicker:july</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8d860a667674628da86b76fb3be676370a61893c" resname="workzone:datepicker:june">
         <source>workzone:datepicker:june</source>
         <target state="new">workzone:datepicker:june</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2242d17f28dc262529688d688b5c2e128813ad8b" resname="workzone:datepicker:march">
         <source>workzone:datepicker:march</source>
         <target state="new">workzone:datepicker:march</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2ce30e1185f0f46df340ca727d4d9d89f42b6f5b" resname="workzone:datepicker:may">
         <source>workzone:datepicker:may</source>
         <target state="new">workzone:datepicker:may</target>
-        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="169">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="8a7199e82486037293a2cfb17003ed9a30e2cfb2" resname="workzone:datepicker:monday">
         <source>workzone:datepicker:monday</source>
         <target state="new">workzone:datepicker:monday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="0bbaf1d4dbaa3b5eb27154fcc9579f89c848b091" resname="workzone:datepicker:nextText">
         <source>workzone:datepicker:nextText</source>
         <target state="new">workzone:datepicker:nextText</target>
-        <jms:reference-file line="112">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="167">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ba391713621e89b5ecec7bc867e949e386332732" resname="workzone:datepicker:november">
         <source>workzone:datepicker:november</source>
         <target state="new">workzone:datepicker:november</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="46727c5b9b3455e2cec4fc761568262af710f119" resname="workzone:datepicker:october">
         <source>workzone:datepicker:october</source>
         <target state="new">workzone:datepicker:october</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="7eef21d25b8fa0b6940fe6c87640f82612d0393f" resname="workzone:datepicker:prevText">
         <source>workzone:datepicker:prevText</source>
         <target state="new">workzone:datepicker:prevText</target>
-        <jms:reference-file line="111">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="166">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="9d4fa7c1a1d4486201a760bcfb2f342ec8329f00" resname="workzone:datepicker:saturday">
         <source>workzone:datepicker:saturday</source>
         <target state="new">workzone:datepicker:saturday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="a8aa1e4c6df39f7365a4fab8f3c70d3d8d4757ee" resname="workzone:datepicker:september">
         <source>workzone:datepicker:september</source>
         <target state="new">workzone:datepicker:september</target>
-        <jms:reference-file line="115">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="170">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="cd48f23064201336fafcab46a34c085d5a886cb6" resname="workzone:datepicker:sunday">
         <source>workzone:datepicker:sunday</source>
         <target state="new">workzone:datepicker:sunday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="de522dc0285d55c95bb9af4aa39020ac35548353" resname="workzone:datepicker:thursday">
         <source>workzone:datepicker:thursday</source>
         <target state="new">workzone:datepicker:thursday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d274289f8c48bcb43c06efe9386967b7f8fb56df" resname="workzone:datepicker:tuesday">
         <source>workzone:datepicker:tuesday</source>
         <target state="new">workzone:datepicker:tuesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="423742b6f616f9847ea24afec03e24b15f3ff10f" resname="workzone:datepicker:wednesday">
         <source>workzone:datepicker:wednesday</source>
         <target state="new">workzone:datepicker:wednesday</target>
-        <jms:reference-file line="116">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="171">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="a272c87e7e6d13003b19b8b8169847c9c2fe8ef0" resname="workzone:feedback:expiration">
-        <source>workzone:feedback:expiration</source>
-        <target state="new">workzone:feedback:expiration</target>
-        <jms:reference-file line="95">prod/WorkZone/Basket.html.twig</jms:reference-file>
-        <jms:reference-file line="14">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      <trans-unit id="cbfb58c29147c5881e828d18a477f922211873a0" resname="workzone:feedback:expiration-closed">
+        <source>workzone:feedback:expiration-closed</source>
+        <target state="new">workzone:feedback:expiration-closed</target>
+        <jms:reference-file line="105">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="15">prod/Tooltip/Basket.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="32285b1e113decb0a3fdf090b0698c5508a2bd09" resname="workzone:feedback:expiration-open">
+        <source>workzone:feedback:expiration-open</source>
+        <target state="new">workzone:feedback:expiration-open</target>
+        <jms:reference-file line="107">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="17">prod/Tooltip/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2f0e2fbacaf98478f0a46f828495e0dac8772a32" resname="workzone:feedback:update">
         <source>workzone:feedback:update</source>
         <target state="new">workzone:feedback:update</target>
-        <jms:reference-file line="100">prod/WorkZone/Basket.html.twig</jms:reference-file>
+        <jms:reference-file line="114">prod/WorkZone/Basket.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0" resname="yes" approved="yes">
         <source>yes</source>
diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf
index b7398ca514..4797cbcafd 100644
--- a/resources/locales/validators.de.xlf
+++ b/resources/locales/validators.de.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:24Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:44:42Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf
index f8d0a54e1d..398448e7d5 100644
--- a/resources/locales/validators.en.xlf
+++ b/resources/locales/validators.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:35Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:44:55Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf
index 6f350ddd76..8d7c716ebd 100644
--- a/resources/locales/validators.fr.xlf
+++ b/resources/locales/validators.fr.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:06:47Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:45:08Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf
index 2218c1ff00..0f8bf37ddc 100644
--- a/resources/locales/validators.nl.xlf
+++ b/resources/locales/validators.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-03-13T14:07:03Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-03-17T12:45:26Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index 9905cbf49c..49eeec04ba 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -11,7 +11,11 @@
             <span class="expiredDate">
         {% if basket.getValidation() %}
             {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
-            {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}
+            {% if date(dateExpired) < date() %}
+                <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
+                {% else %}
+                <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>
+            {% endif %} {{ dateExpired }}
         {% endif %}
               </span>
     <div style="margin:5px 0;max-height:160px;overflow:hidden;text-overflow:ellipsis;">
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index fb028812d5..9f9995d634 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -1,4 +1,4 @@
-
+<script src="https://rawgithub.com/trentrichardson/jQuery-Timepicker-Addon/master/jquery-ui-timepicker-addon.js"></script>
 <div>
     <button class="tools-accordion">Actions</button>
     <div class="tools-panel">
@@ -99,15 +99,21 @@
             </p>
             <div class="record-number">  {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}</div>
 
-            {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
+            {% set dateExpired = app['date-formatter'].getTranslatedDate(basket.getValidation().getExpires()) %}
             <div class="expiredDate">
-                <span>{{ 'workzone:feedback:expiration' | trans }} :</span>
+                {% if date(dateExpired) < date() %}
+                    <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
+                {% else %}
+                    <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>
+                {% endif %}
+
                 <form class="update-feed-validation">
-                    <input type="hidden" name="feedback-id" value={{ basket.getValidation().getId}} />
-                    <input type="hidden" name="feedback-deadline-format" class="alternate" />
-                <input type="text" class="btn datepicker" name="feedback-deadline" value="{{ dateExpired }}">
-                    <button type="submit" class="submit" title="{{ 'workzone:feedback:update' | trans }}"><i class="fa fa-save"></i></button>
+                    <input type="hidden" name="feedbackId" value={{ basket.getId}} />
+                    <input type="hidden" name="feedbackDate" class="alternate" />
+                <input type="text" class="btn feed-datepicker" name="feedback-deadline" value="{{ dateExpired }}">
+                    <button type="submit" class="submit hidden submit-validation" title="{{ 'workzone:feedback:update' | trans }}"><i class="fa fa-save"></i></button>
                 </form>
+                <p class="message text-right" style="opacity: 0;transition: all 0.2s; color: green; display: block; ">{{ 'prod:workzone:basket:updated-message' | trans }}</p>
             </div>
 
             {% endif %}
@@ -135,7 +141,25 @@
 <script type="text/javascript">
     $( ".update-feed-validation" ).on( "submit", function( event ) {
         event.preventDefault();
-        console.log( $( this ).serialize() );
+        var formData = $(this).serializeArray();
+
+        $.ajax({
+            type: 'POST',
+            url: '/prod/push/update-expiration/',
+            data: {
+                basket_id: formData[0].value,
+                date: formData[1].value
+            },
+            beforeSend: function() {
+                console.log(formData[0].value);
+                console.log(formData[1].value);
+            },
+            success: function (data) {
+                $('.message').css('opacity',1);
+                $('.submit-validation').addClass('hidden');
+                setTimeout(function(){ $('.message').css('opacity',0); }, 2000);
+            },
+        });
     });
     $( function() {
         $.datepicker.regional['default'] = {
@@ -149,11 +173,15 @@
             dayNamesMin: [ "D","L","M","M","J","V","S" ],
             dateFormat: "d MM yy",
             altField: ".alternate",
-            altFormat: "yy-mm-dd"
+            altFormat: "yy-mm-dd",
+            minDate: 0
 
         };
 
-        $( ".datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
+        $(".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
+        $(".feed-datepicker" ).change(function() {
+            $('.submit-validation').removeClass('hidden');
+        })
     })
 
 </script>
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Plugin/AddPluginTest.php b/tests/Alchemy/Tests/Phrasea/Command/Plugin/AddPluginTest.php
index 523b4c00da..506c4f104a 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Plugin/AddPluginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Plugin/AddPluginTest.php
@@ -69,7 +69,7 @@ class AddPluginTest extends PluginCommandTestCase
         // the plugin is checked when updating config files
         self::$DI['cli']['plugins.plugins-validator']->expects($this->at(0))
             ->method('validatePlugin')
-            ->with('tempdir')
+            ->with('TestPlugin')
             ->will($this->returnValue($manifest));
 
         self::$DI['cli']['plugins.plugins-validator']->expects($this->at(1))
diff --git a/yarn.lock b/yarn.lock
index 4af2ac395c..319e85d277 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5305,10 +5305,14 @@ jquery-simplecolorpicker@^0.3.1:
   resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb"
   integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs=
 
-"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e":
+"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e":
+  version "1.4.2"
+  resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
+
+"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git":
   version "1.4.2"
   uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e"
-  resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
+  resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
 
 jquery-ui-datepicker-with-i18n@^1.10.4:
   version "1.10.4"