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 b5805da041..b8136d91a5 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,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 @@ -117,6 +124,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` @@ -144,14 +165,35 @@ 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) +``` + # Try Phraseanet with Pre installed VM (deprecated) You can also download a testing pre installed Virtual Machine in OVA format here : https://www.phraseanet.com/download/ - -# Phraseanet With Vagrant, for developement only (deprecated) +# With Vagrant (deprecated) ## Development : @@ -170,3 +212,5 @@ Ex: - vagrant up --provision //// 5.6 ///// 1 >> Build the alchemy/phraseanet-php-5.6 box + + 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 @@ +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 %s 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 @@ +setName('install') + ->setDescription('Install plugins'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $plugins = trim(getenv('PHRASEANET_PLUGINS')); + if (empty($plugins)) { + $output->writeln('No plugin to install... SKIP'); + + 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 %s (branch: %s)', $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 @@ +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 $source..."); - $this->container['plugins.importer']->import($source, $temporaryDir); - $output->writeln(" OK"); - $output->write("Validating plugin..."); - $manifest = $this->container['plugins.plugins-validator']->validatePlugin($temporaryDir); + $manifest = $this->container['plugins.plugins-validator']->validatePlugin($source); $output->writeln(" OK found ".$manifest->getName().""); $targetDir = $this->container['plugin.path'] . DIRECTORY_SEPARATOR . $manifest->getName(); + if (normalizePath($targetDir) !== normalizePath($source)) { + $temporaryDir = $this->container['temporary-filesystem']->createTemporaryDirectory(); + $output->write("Importing $source..."); + $this->container['plugins.importer']->import($source, $temporaryDir); + $output->writeln(" OK"); + $workingDir = $temporaryDir; + } else { + $workingDir = $targetDir; + } - $output->write("Setting up composer..."); - $this->container['plugins.composer-installer']->install($temporaryDir); - $output->writeln(" OK"); + if (!is_dir($workingDir.'/vendor')) { + $output->write("Setting up composer..."); + $this->container['plugins.composer-installer']->install($workingDir); + $output->writeln(" OK"); + } $output->write("Installing plugin ".$manifest->getName()."..."); - $this->container['filesystem']->mirror($temporaryDir, $targetDir); + if (isset($temporaryDir)) { + $this->container['filesystem']->mirror($temporaryDir, $targetDir); + } $output->writeln(" OK"); $output->write("Copying public files ".$manifest->getName()."..."); $this->container['plugins.assets-manager']->update($manifest); $output->writeln(" OK"); - $output->write("Removing temporary directory..."); - $this->container['filesystem']->remove($temporaryDir); - $output->writeln(" OK"); + if (isset($temporaryDir)) { + $output->write("Removing temporary directory..."); + $this->container['filesystem']->remove($temporaryDir); + $output->writeln(" OK"); + } $output->write("Activating plugin..."); $this->container['conf']->set(['plugins', $manifest->getName(), 'enabled'], true); diff --git a/lib/classes/phraseadate.php b/lib/classes/phraseadate.php index c501eadd5d..6acca8b75f 100644 --- a/lib/classes/phraseadate.php +++ b/lib/classes/phraseadate.php @@ -90,13 +90,14 @@ class phraseadate $compareTo = new DateTime('now'); $diff = $compareTo->format('U') - $date->format('U'); + $yearDiff = $compareTo->format('Y') - $date->format('Y'); $dayDiff = floor($diff / 86400); if (is_nan($dayDiff) || $dayDiff > 365000) { return ''; } - $date_string = $this->formatDate($date, $this->app['locale'], 'DAY_MONTH'); + $date_string = $this->formatDate($date, $this->app['locale'], ($yearDiff != 0) ? 'DAY_MONTH_YEAR' : 'DAY_MONTH'); if ($dayDiff == 0) { if ($diff < 60) { diff --git a/package.json b/package.json index 70d1fbaddb..7ce6d01a66 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.149-d", + "phraseanet-production-client": "0.34.150-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 6d303f8141..9ca23ed2d7 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - + 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. @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% Dokument(e) - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% Datensätze prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1397,10 +1397,10 @@ Back Zurück mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -1689,7 +1689,7 @@ Certaines donnees du panier ont change Einige Daten des Sammelkorbs wurden verändert - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -2302,7 +2302,7 @@ Deconnexion Abmeldung - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2566,8 +2566,7 @@ Do you want to send your report ? Möchten Sie Ihren Bericht senden ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3214,7 +3213,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -3619,7 +3618,7 @@ Hautpseite mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4900,12 +4899,12 @@ Paniers Sammelkörbe - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7333,11 +7332,11 @@ Validations Bestätigung - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7408,13 +7407,13 @@ Voici vos paniers Ihre Sammelkörbe - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Hier sind Ihre aktuellen Bewertungen - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7978,8 +7977,8 @@ a propos Über - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -7998,14 +7997,14 @@ action : collection Verschieben prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Bearbeiten prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8013,7 +8012,7 @@ action : exporter Exportieren prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8023,20 +8022,20 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils Werkzeuge prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Drucken prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8047,7 +8046,7 @@ action : publier Veröffentlichen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8055,14 +8054,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Eigenschaften prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9138,13 +9137,13 @@ basket:action:delete record form basket basket:action:delete record form basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database basket:action:delete record form database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -9431,7 +9430,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10114,14 +10113,14 @@ lightbox::list lightbox::list - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Übersicht - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,44 +10135,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11058,32 +11057,32 @@ phraseanet::temps:: a l'instant gerade - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gestern - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures vor %quantity% Stunde - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes vor %quantity% Minuten - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure vor einer Stunde - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute vor einer Minute - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11716,6 +11715,11 @@ Auswahl entfernen prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options prod:workzone:facetstab:search_and_facets_sort_options @@ -11822,7 +11826,7 @@ Aktualisieren prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13359,8 +13363,8 @@ validation::envoyer mon rapport Meinen Bericht senden - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13390,11 +13394,131 @@ Video Werkzeug actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration workzone:feedback:expiration - prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/WorkZone/Basket.html.twig + prod/Tooltip/Basket.html.twig + + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig yes diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index a5ab91f476..301050bb79 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - + 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. - - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% document(s) - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% records prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1398,10 +1398,10 @@ Back Previous mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -1690,7 +1690,7 @@ Certaines donnees du panier ont change This basket has been updated - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -2305,7 +2305,7 @@ Deconnexion Logout - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2569,8 +2569,7 @@ Do you want to send your report ? Send your Report ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3217,7 +3216,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -3622,7 +3621,7 @@ Home mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -3952,9 +3951,9 @@ admin/statusbit/edit.html.twig admin/statusbit/edit.html.twig - + Language selection - Language selection + Language selection web/prod/index.html.twig @@ -4903,12 +4902,12 @@ Paniers Baskets - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7336,11 +7335,11 @@ Validations Feedbacks - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7411,13 +7410,13 @@ Voici vos paniers Your Basket(s) - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Your feedbacks in progress - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7981,8 +7980,8 @@ a propos About - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8001,14 +8000,14 @@ action : collection Move prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Edit prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8016,7 +8015,7 @@ action : exporter Export prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8026,20 +8025,20 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils Tools prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Print prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8050,7 +8049,7 @@ action : publier Publish prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8058,14 +8057,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Properties prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9141,13 +9140,13 @@ basket:action:delete record form basket Delete record from basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database Delete record from database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -9434,7 +9433,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10059,14 +10058,14 @@ Hidden Facets web/prod/index.html.twig - + index::advance_search: order-by-hits - By Hits + By Hits web/prod/index.html.twig - + index::advance_search: order-by-hits-asc - By Hits asc + By Hits asc web/prod/index.html.twig @@ -10094,9 +10093,9 @@ June classes/module/report.php - + language - Current Language + Language login/include/language-block.html.twig @@ -10117,14 +10116,14 @@ lightbox::list Summary - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Summary - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10138,45 +10137,45 @@ lightbox:feedback:sendreport:warnwindows:cancel - lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Cancel report sending and continue + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message - lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Your feedback contains + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved - lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Approved + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_rejected - lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Rejected + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed - lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Unexpressed + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title - lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + Feedback summary + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate - lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Send my report + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11061,32 +11060,32 @@ phraseanet::temps:: a l'instant Just now - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Yesterday - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures %quantity% hours ago - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes %quantity% minutes ago - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure One hour ago - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute One minute ago - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11722,6 +11721,11 @@ It is possible to place several search areas Delete Selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + Creation + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options Option @@ -11729,17 +11733,17 @@ It is possible to place several search areas prod:workzone:facetstab:tooltips:facet_and_filter - prod:workzone:facetstab:tooltips:facet_and_filter + Include into results web/prod/index.html.twig prod:workzone:facetstab:tooltips:facet_except_filter - prod:workzone:facetstab:tooltips:facet_except_filter + Exclude form results web/prod/index.html.twig prod:workzone:facetstab:tooltips:remove_facet_filter - prod:workzone:facetstab:tooltips:remove_facet_filter + Remove filter web/prod/index.html.twig @@ -11828,7 +11832,7 @@ It is possible to place several search areas Refresh prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13365,8 +13369,8 @@ It is possible to place several search areas validation::envoyer mon rapport Send my feedback - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13396,11 +13400,131 @@ It is possible to place several search areas Thumbnail Tools actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + April + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + August + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + December + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + February + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + Friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + January + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + July + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + June + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + March + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + May + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + Monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + Next + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + November + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + October + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + Previous + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + Saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + September + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + Sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + Thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + Tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + Wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration - workzone:feedback:expiration - prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + Feedback open Until + prod/WorkZone/Basket.html.twig + prod/Tooltip/Basket.html.twig + + + workzone:feedback:update + Update Date + prod/WorkZone/Basket.html.twig yes diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 3ae907a829..a8166562ca 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - + 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. - - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% documents - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% enregistrement(s) prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1397,10 +1397,10 @@ Back Retour mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -1689,7 +1689,7 @@ Certaines donnees du panier ont change Certaines données du panier ont changé - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -2302,7 +2302,7 @@ Deconnexion Déconnexion - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2566,8 +2566,7 @@ Do you want to send your report ? Souhaitez-vous envoyer votre rapport ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3214,7 +3213,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -3619,7 +3618,7 @@ Accueil mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -3949,9 +3948,9 @@ admin/statusbit/edit.html.twig admin/statusbit/edit.html.twig - + Language selection - Language selection + Language selection web/prod/index.html.twig @@ -4900,12 +4899,12 @@ Paniers Paniers - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7335,11 +7334,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Validations Validations - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7410,13 +7409,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Voici vos paniers Paniers disponibles - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Demandes de validations en cours - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7980,8 +7979,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis a propos A propos - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8000,14 +7999,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : collection Déplacer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Editer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8015,7 +8014,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : exporter Exporter prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8025,20 +8024,20 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils Outils prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Imprimer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8049,7 +8048,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : publier Publier prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8057,14 +8056,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Propriétés prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9141,13 +9140,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le basket:action:delete record form basket Retirer du panier prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database Supprimer l'enregistrement de la base prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -9434,7 +9433,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10059,14 +10058,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Facettes masquées web/prod/index.html.twig - + index::advance_search: order-by-hits - Par occurrences + Par occurrences web/prod/index.html.twig - + index::advance_search: order-by-hits-asc - Par occurrences asc + Par occurrences asc web/prod/index.html.twig @@ -10094,9 +10093,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le juin classes/module/report.php - + language - Langue actuelle + Langue login/include/language-block.html.twig @@ -10117,14 +10116,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le lightbox::list Vignette - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Récapitulatif - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10138,45 +10137,45 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le lightbox:feedback:sendreport:warnwindows:cancel - lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Annuler l'envois et continuer la validation + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message - lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Récapitulatif des choix de la validation + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved - lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Approuvés + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected - lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Refusés + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed - lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Non exprimé + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title - lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + Résumé de la validation + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate - lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + Confirmer l'envois du rapport + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11061,32 +11060,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::temps:: a l'instant A l'instant - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Hier - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures Il y a %quantity% heures - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes Il y a %quantity% minutes - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure Il y a une heure - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute Il y a une minute - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11725,6 +11724,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Supprimer la selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + Date de création + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options Options @@ -11732,17 +11736,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod:workzone:facetstab:tooltips:facet_and_filter - prod:workzone:facetstab:tooltips:facet_and_filter + Inclure les résultats web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:facet_except_filter - prod:workzone:facetstab:tooltips:facet_except_filter + Exclure les résultats web/prod/index.html.twig prod:workzone:facetstab:tooltips:remove_facet_filter - prod:workzone:facetstab:tooltips:remove_facet_filter + Supprimer le filtre web/prod/index.html.twig @@ -11831,7 +11835,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Rafraîchir prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13368,8 +13372,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le validation::envoyer mon rapport Envoyer mon rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13399,11 +13403,131 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Outils vidéos actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + Avril + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + Aout + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + Clore + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + courant + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + Décembre + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + Février + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + Vendredi + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + Janvier + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + Juillet + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + Juin + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + Mars + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + Mai + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + Lundi + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + Suivant + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + Novembre + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + Octobre + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + Précédent + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + Samedi + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + Septembre + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + Dimanche + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + Jeudi + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + Mardi + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + Mercredi + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration - workzone:feedback:expiration - prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + Validation ouverte jusqu'au + prod/WorkZone/Basket.html.twig + prod/Tooltip/Basket.html.twig + + + workzone:feedback:update + Valider + prod/WorkZone/Basket.html.twig yes diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 933082ae1a..c61524de6a 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - + 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. @@ -121,7 +121,7 @@ %basket_length% documents %basket_length% documenten - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -197,7 +197,7 @@ %nb_records% records %nb_records% records prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1402,10 +1402,10 @@ Back Terug mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -1694,7 +1694,7 @@ Certaines donnees du panier ont change Sommige gegevens in het mandje zijn veranderd - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -2309,7 +2309,7 @@ Deconnexion Log out - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2573,8 +2573,7 @@ Do you want to send your report ? Wenst u uw rapport te sturen ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3224,7 +3223,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -3629,7 +3628,7 @@ Startpagina mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4910,12 +4909,12 @@ Paniers Mandjes - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7343,11 +7342,11 @@ Validations Controles - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7418,13 +7417,13 @@ Voici vos paniers Uw mandjes - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Een controle in proces - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7988,8 +7987,8 @@ a propos Over - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8008,14 +8007,14 @@ action : collection Collectie prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Wijzigen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8023,7 +8022,7 @@ action : exporter Exporteer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8033,20 +8032,20 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils Gereedschappen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Print prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8057,7 +8056,7 @@ action : publier Publiceren prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8065,14 +8064,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Status prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9148,13 +9147,13 @@ basket:action:delete record form basket basket:action:delete record form basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database basket:action:delete record form database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -9441,7 +9440,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10124,14 +10123,14 @@ lightbox::list lightbox::list - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Beknopt - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10146,44 +10145,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11068,32 +11067,32 @@ phraseanet::temps:: a l'instant op dit moment - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gisteren - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures phraseanet::temps:: il y a %quantity% heures - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes phraseanet::temps:: il y a %quantity% minutes - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure een uur geleden - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute één minuut geleden - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11726,6 +11725,11 @@ prod:push: delete selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options prod:workzone:facetstab:search_and_facets_sort_options @@ -11832,7 +11836,7 @@ vernieuwen prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13369,8 +13373,8 @@ validation::envoyer mon rapport stuur mijn rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13400,11 +13404,131 @@ video tool actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration workzone:feedback:expiration - prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/WorkZone/Basket.html.twig + prod/Tooltip/Basket.html.twig + + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig yes diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 33596e5930..b7398ca514 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - + 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. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index c0a4fb87ee..f8d0a54e1d 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - + 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. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 2dc9b0935b..6f350ddd76 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - + 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. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 722071bff5..2218c1ff00 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - + 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. diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index efd82d2c8f..9905cbf49c 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -8,21 +8,22 @@ {% block content %} + + {% if basket.getValidation() %} + {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} + {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} + {% endif %} + {{ basket.getDescription()|nl2br }} {% set nb_records = basket.getElements()|length %} {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %} - - {% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} - {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} - {% endif %} - - + + {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %} - - {{ date }} + - {{ 'prod:workzone:basket:creation-date' | trans }} : {{ date }} diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 524665ea03..fb028812d5 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -1,3 +1,4 @@ + Actions @@ -89,10 +90,28 @@ {% endif %} {% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} - - {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} - {% endif %} + + {% set nb_records = basket.getElements()|length %} + {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %} + + + {{ 'prod:workzone:basket:creation-date' | trans }} : {{ date }} + + {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %} + + {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} + + {{ 'workzone:feedback:expiration' | trans }} : + + + + + + + + + {% endif %} + {% set basket_length = basket.getElements()|length %} {{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }} @@ -113,4 +132,31 @@ + + + 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 98775d43a0..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" @@ -7577,10 +7581,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.149-d: - version "0.34.149-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.149-d.tgz#e486bbe160861d259b005c7b549d8f1ea08cd82d" - integrity sha512-7aXn1WWcALhuruiz8dkLS67Z6MNkQZoxoehCE7iRdnIDRzKioYQ1wycia4MtxyL+4S5XZZb39HIunvdxGsgDSQ== +phraseanet-production-client@0.34.150-d: + version "0.34.150-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" + integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"
+ {{ 'prod:workzone:basket:creation-date' | trans }} : {{ date }} +