From 857f5af11407f93bea9bc7b50b154f8a94bdf287 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 21 May 2020 14:13:34 +0400 Subject: [PATCH 01/19] PHRAS-3082 --- resources/www/admin/images/cogs-solid.svg | 1 + resources/www/admin/images/searchengin.svg | 1 + resources/www/admin/images/tools-solid.svg | 1 + resources/www/admin/styles/main.scss | 6 +++ templates/web/admin/tree.html.twig | 5 ++- .../worker_configuration.html.twig | 7 ++- .../worker-manager/worker_info.html.twig | 45 ++++++++++--------- .../worker-manager/worker_metadata.html.twig | 2 +- .../worker_pull_assets.html.twig | 4 +- .../worker_searchengine.html.twig | 8 ++-- .../worker-manager/worker_subview.html.twig | 2 +- 11 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 resources/www/admin/images/cogs-solid.svg create mode 100644 resources/www/admin/images/searchengin.svg create mode 100644 resources/www/admin/images/tools-solid.svg diff --git a/resources/www/admin/images/cogs-solid.svg b/resources/www/admin/images/cogs-solid.svg new file mode 100644 index 0000000000..61192b97b2 --- /dev/null +++ b/resources/www/admin/images/cogs-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/images/searchengin.svg b/resources/www/admin/images/searchengin.svg new file mode 100644 index 0000000000..289aad5ffe --- /dev/null +++ b/resources/www/admin/images/searchengin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/images/tools-solid.svg b/resources/www/admin/images/tools-solid.svg new file mode 100644 index 0000000000..5f5e5a3a1d --- /dev/null +++ b/resources/www/admin/images/tools-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index cff7851f82..21beb65782 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -912,6 +912,12 @@ span.simplecolorpicker.picker { .ui-dialog-titlebar-close { text-indent: -9999999px; } +.worker-info-block { + .btn-primary { + min-width: 161px; + margin-right: 15px; + } +} @import './databases'; @import './fields'; @import './tables'; diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index 08da90f9b7..3d6416deaa 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -18,12 +18,13 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).is_admin() %}
  • - + {% trans %}Setup{% endtrans %}
  • + {{ 'SearchEngine settings' | trans }}
    • @@ -79,7 +80,7 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::TASKMANAGER')) %}
  • - + {{ 'Worker Manager' | trans }}
    • diff --git a/templates/web/admin/worker-manager/worker_configuration.html.twig b/templates/web/admin/worker-manager/worker_configuration.html.twig index 34ca537f93..90f49f0cc6 100644 --- a/templates/web/admin/worker-manager/worker_configuration.html.twig +++ b/templates/web/admin/worker-manager/worker_configuration.html.twig @@ -1,7 +1,6 @@ -

    Config Worker queue retry

    +

    {{ 'admin::workermanager:tab:workerconfig: title' |trans }}

    - Warning! - When applied, it's re-initialize and purge "retry" and "delayed" queue! + {{ 'admin::workermanager:tab:workerconfig: warning' |trans }}

    Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)

    @@ -48,7 +47,7 @@
    - +
    diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig index 78864573e3..daad6ab8d3 100644 --- a/templates/web/admin/worker-manager/worker_info.html.twig +++ b/templates/web/admin/worker-manager/worker_info.html.twig @@ -1,40 +1,44 @@ {% if not reload %} -

    worker information

    - +

    {{ 'admin::workermanager:tab:workerinfo: title' |trans }}

    +
    -

    - Warning! - {{ "It's delete all work information !" |trans }} -

    - +

    + + + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all information" |trans }} + +

    -

    - Warning! - {{ "It's delete all finished works !"|trans }} +

    + + + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all finished"|trans }} + +

    -
    +
    @@ -50,7 +54,7 @@ {% endif %} - {% for workerRow in workerRunningJob %} +{% for workerRow in workerRunningJob | sort | reverse %} @@ -59,9 +63,8 @@ - - {% endfor %} +{% endfor %} {% if not reload %} diff --git a/templates/web/admin/worker-manager/worker_metadata.html.twig b/templates/web/admin/worker-manager/worker_metadata.html.twig index ec122fe8e8..0193dbdb53 100644 --- a/templates/web/admin/worker-manager/worker_metadata.html.twig +++ b/templates/web/admin/worker-manager/worker_metadata.html.twig @@ -1 +1 @@ -

    Write metadata setting

    +

    admin::workermanager:tab:metadata: title

    diff --git a/templates/web/admin/worker-manager/worker_pull_assets.html.twig b/templates/web/admin/worker-manager/worker_pull_assets.html.twig index 11a8dfdb77..1e2d3fd68a 100644 --- a/templates/web/admin/worker-manager/worker_pull_assets.html.twig +++ b/templates/web/admin/worker-manager/worker_pull_assets.html.twig @@ -1,4 +1,4 @@ -

    Pull Assets from uploader setting

    +

    {{ 'admin::workermanager:tab:pullassets: title' |trans }}

    {{ form_start(form, {'action': path('worker_admin_pullAssets')}) }} @@ -23,7 +23,7 @@
    - +
    {{ form_end(form) }} diff --git a/templates/web/admin/worker-manager/worker_searchengine.html.twig b/templates/web/admin/worker-manager/worker_searchengine.html.twig index f2c770aa68..1a30042c98 100644 --- a/templates/web/admin/worker-manager/worker_searchengine.html.twig +++ b/templates/web/admin/worker-manager/worker_searchengine.html.twig @@ -1,4 +1,4 @@ -

    Populate elasticsearch index

    +

    {{ 'admin::workermanager:tab:searchengine: title' |trans }}

    {{ form_start(form, {'action': path('worker_admin_searchengine')}) }} @@ -15,7 +15,7 @@
    - +
    {{ workerRow.databoxId }} {{ workerRow.recordId }}{{ workerRow.created|date('Y-m-d H:i:s') }} {{ workerRow.published|date('Y-m-d H:i:s') }} {{ workerRow.status }}
    - - - - - - - + + + + + + + From a0521c59fcad1162f2885a3773c9f14e1baa2766 Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 22 May 2020 12:24:19 +0300 Subject: [PATCH 04/19] port to 4.1 archive task improvement --- .../Phrasea/TaskManager/Job/ArchiveJob.php | 148 ++++++++++++------ lib/classes/databox/status.php | 4 +- 2 files changed, 99 insertions(+), 53 deletions(-) diff --git a/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php b/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php index de418a4e71..35bc878008 100644 --- a/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php +++ b/lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php @@ -181,11 +181,12 @@ class ArchiveJob extends AbstractJob $dom = new \DOMDocument(); $dom->formatOutput = true; + /** @var \DOMElement $root */ $root = $dom->appendChild($dom->createElement('root')); $nnew = $this->listFilesPhase1($app, $dom, $root, $path_in, $server_coll_id, 0, $TColls); if ($app['debug']) { - $this->log('debug', "=========== listFilesPhase1 ========== (returned " . $nnew . ")\n" . $dom->saveXML()); + $this->log('debug', "== listFilesPhase1 returned " . $nnew . ")\n" . $dom->saveXML()); } if (!$this->isStarted()) { @@ -193,15 +194,16 @@ class ArchiveJob extends AbstractJob } // wait for files to be cold - $this->pause($cold); - - if (!$this->isStarted()) { - return; + for($i=0; $i<($cold*2); $i++) { + if (!$this->isStarted()) { + return; + } + $this->pause(0.5); } $this->listFilesPhase2($app, $dom, $root, $path_in, 0); if ($app['debug']) { - $this->log('debug', "=========== listFilesPhase2 ========== : \n" . $dom->saveXML()); + $this->log('debug', "== listFilesPhase2\n" . $dom->saveXML()); } if (!$this->isStarted()) { @@ -210,31 +212,35 @@ class ArchiveJob extends AbstractJob $this->makePairs($dom, $root, $path_in, $path_archived, $path_error, false, 0, $tmask, $tmaskgrp); if ($app['debug']) { - $this->log('debug', "=========== makePairs ========== : \n" . $dom->saveXML()); - } - - $r = $this->removeBadGroups($app, $dom, $root, $path_in, $path_archived, $path_error, 0, $moveError); - if ($app['debug']) { - $this->log('debug', "=========== removeBadGroups ========== (returned " . ((Boolean) $r ? 'true' : 'false') . ") : \n" . $dom->saveXML()); - } - - $this->archive($app, $databox, $dom, $root, $path_in, $path_archived, $path_error, 0, $moveError, $moveArchived, $stat0, $stat1); - if ($app['debug']) { - $this->log('debug', "=========== archive ========== : \n" . $dom->saveXML()); + $this->log('debug', "== makePairs\n" . $dom->saveXML()); } if (!$this->isStarted()) { return; } + $this->removeBadGroups($app, $dom, $root, $path_in, $path_archived, $path_error, 0, $moveError); + if ($app['debug']) { + $this->log('debug', "== removeBadGroups\n" . $dom->saveXML()); + } + + if (!$this->isStarted()) { + return; + } + + $this->archive($app, $databox, $dom, $root, $path_in, $path_archived, $path_error, 0, $moveError, $moveArchived, $stat0, $stat1); + if ($app['debug']) { + $this->log('debug', "== archive\n" . $dom->saveXML()); + } + $this->bubbleResults($dom, $root, $path_in, 0, \p4field::isyes($settings->copy_spe)); if ($app['debug']) { - $this->log('debug', "=========== bubbleResults ========== : \n" . $dom->saveXML()); + $this->log('debug', "== bubbleResults\n" . $dom->saveXML()); } $moved = $this->moveFiles($app, $dom, $root, $path_in, $path_archived, $path_error, 0, $moveArchived, $moveError); if ($app['debug']) { - $this->log('debug', "=========== moveFiles ========== (returned " . ($moved ? 'true' : 'false') . ") : \n" . $dom->saveXML()); + $this->log('debug', "== moveFiles returned " . ($moved ? 'true' : 'false') . "\n" . $dom->saveXML()); } } } @@ -243,15 +249,17 @@ class ArchiveJob extends AbstractJob { $nnew = 0; - if (false !== $sxDotPhrasea = @simplexml_load_file($path . '/.phrasea.xml')) { + $magicfile = $magicmethod = null; + + if (($sxDotPhrasea = @simplexml_load_file($path . '/.phrasea.xml')) !== false) { // test for magic file if (($magicfile = trim((string) ($sxDotPhrasea->magicfile))) != '') { $magicmethod = strtoupper($sxDotPhrasea->magicfile['method']); - if ($magicmethod == 'LOCK' && true === $app['filesystem']->exists($path . '/' . $magicfile)) { - return; - } elseif ($magicmethod == 'UNLOCK' && false === $app['filesystem']->exists($path . '/' . $magicfile)) { - return; + if ($magicmethod == 'LOCK' && ($app['filesystem']->exists($path . '/' . $magicfile) === true)) { + return 0; + } elseif ($magicmethod == 'UNLOCK' && ($app['filesystem']->exists($path . '/' . $magicfile) === false)) { + return 0; } } @@ -278,6 +286,7 @@ class ArchiveJob extends AbstractJob continue; } + /** @var \DOMElement $n */ if (is_dir($path . '/' . $file)) { $n = $node->appendChild($dom->createElement('file')); $n->setAttribute('isdir', '1'); @@ -293,6 +302,16 @@ class ArchiveJob extends AbstractJob foreach (["size", "ctime", "mtime"] as $k) { $n->setAttribute($k, $stat[$k]); } + // special file + if($file == '.phrasea.xml') { + $n->setAttribute('match', '*'); + } + // special file + if($file === $magicfile) { + $n->setAttribute('match', '*'); + $node->setAttribute('magicfile', $magicfile); + $node->setAttribute('magicmethod', $magicmethod); + } $nnew++; } $n->setAttribute('cid', $server_coll_id); @@ -335,27 +354,31 @@ class ArchiveJob extends AbstractJob $dnl = @$xp->query('./file[@name="' . $file . '"]', $node); if ($dnl && $dnl->length == 0) { if (is_dir($path . '/' . $file)) { + /** @var \DOMElement $n */ $n = $node->appendChild($dom->createElement('file')); $n->setAttribute('isdir', '1'); $n->setAttribute('name', $file); $nnew += $this->listFilesPhase2($app, $dom, $n, $path . '/' . $file, $depth + 1); } else { + /** @var \DOMElement $n */ $n = $node->appendChild($dom->createElement('file')); $n->setAttribute('name', $file); $nnew++; } - $this->setBranchHot($dom, $n); + $this->setBranchHot($n); } elseif ($dnl && $dnl->length == 1) { - $dnl->item(0)->setAttribute('temperature', 'cold'); + /** @var \DOMElement $n */ + $n = $dnl->item(0); + $n->setAttribute('temperature', 'cold'); if (is_dir($path . '/' . $file)) { - $this->listFilesPhase2($app, $dom, $dnl->item(0), $path . '/' . $file, $depth + 1); + $this->listFilesPhase2($app, $dom, $n, $path . '/' . $file, $depth + 1); } else { $stat = stat($path . '/' . $file); foreach (["size", "ctime", "mtime"] as $k) { - if ($dnl->item(0)->getAttribute($k) != $stat[$k]) { - $this->setBranchHot($dom, $dnl->item(0)); + if ($n->getAttribute($k) != $stat[$k]) { + $this->setBranchHot($n); break; } } @@ -399,13 +422,16 @@ class ArchiveJob extends AbstractJob if ($dnl->length == 1) { // this group is old (don't care about any linked files), just flag it $n->setAttribute('grp', 'tocomplete'); - $dnl->item(0)->setAttribute('match', '*'); + /** @var \DOMElement $_n */ + $_n = $dnl->item(0); + $_n->setAttribute('match', '*'); // recurse only if group is ok $this->makePairs($dom, $n, $path . '/' . $name, $path_archived, $path_error, true, $depth + 1, $tmask, $tmaskgrp); } else { // this group in new (to be created) // do we need one (or both) linked file ? (caption or representation) $err = false; + /** @var \DOMElement[] $flink */ $flink = ['caption' => null, 'representation' => null]; foreach ($flink as $linkName => $v) { @@ -473,12 +499,12 @@ class ArchiveJob extends AbstractJob // this is a file if (!$n->getAttribute('match')) { // because match can be set before - if ($name == '.phrasea.xml') { - // special file(s) always ok - $n->setAttribute('match', '*'); - } else { +// if ($name == '.phrasea.xml') { +// // special file(s) always ok +// $n->setAttribute('match', '*'); +// } else { $this->checkMatch($dom, $n, $tmask); - } +// } } } } @@ -503,7 +529,7 @@ class ArchiveJob extends AbstractJob // if root of hotfolder if hot, die... if ($depth == 0 && $node->getAttribute('temperature') == 'hot') { - return $ret; + return; } $nodesToDel = []; @@ -522,7 +548,7 @@ class ArchiveJob extends AbstractJob $name = $n->getAttribute('name'); if ($n->getAttribute('isdir')) { - $ret |= $this->removeBadGroups($app, $dom, $n, $path . '/' . $name + $this->removeBadGroups($app, $dom, $n, $path . '/' . $name , $path_archived . '/' . $name , $path_error . '/' . $name , $depth + 1, $moveError); @@ -642,7 +668,7 @@ class ArchiveJob extends AbstractJob } if ($node->getAttribute('temperature') == 'hot') { - return; + return 0; } $ret = 0; @@ -758,7 +784,7 @@ class ArchiveJob extends AbstractJob } } - if (!$n->getAttribute('keep')) { + if (!$n->getAttribute('keep') && !$n->getAttribute('match')) { $this->log('debug', sprintf('delete \'%s\'', $path . '/' . $name)); try { @@ -792,7 +818,9 @@ class ArchiveJob extends AbstractJob if ($dnl->length == 1) { // the caption file exists $node->setAttribute('match', $captionFileName); - $dnl->item(0)->setAttribute('match', '*'); + /** @var \DOMElement $n */ + $n = $dnl->item(0); + $n->setAttribute('match', '*'); } else { // the caption file is missing $node->setAttribute('match', '?'); @@ -817,7 +845,7 @@ class ArchiveJob extends AbstractJob return ($f[0] == '.' && $f != '.phrasea.xml' && $f != '.grouping.xml') || $f == 'thumbs.db' || $f == 'par-system'; } - private function setBranchHot(\DOMDocument $dom, \DOMElement $node) + private function setBranchHot(\DOMElement $node) { for ($n = $node; $n; $n = $n->parentNode) { if ($n->nodeType == XML_ELEMENT_NODE) { @@ -847,8 +875,10 @@ class ArchiveJob extends AbstractJob if ($node->getAttribute('grp') == 'tocreate') { $representationFileName = null; + /** @var \DOMElement $representationFileNode */ $representationFileNode = null; $captionFileName = null; + /** @var \DOMElement $captionFileNode */ $captionFileNode = null; $cid = $node->getAttribute('cid'); $genericdoc = null; @@ -903,6 +933,7 @@ class ArchiveJob extends AbstractJob } file_put_contents($groupingFile, ''); + /** @var \DOMElement $n */ $n = $node->appendChild($dom->createElement('file')); $n->setAttribute('name', '.grouping.xml'); $n->setAttribute('temperature', 'cold'); @@ -1025,6 +1056,8 @@ class ArchiveJob extends AbstractJob } $story = \record_adapter::createStory($app, $collection); + + $story->setStatus($status); $app['subdef.substituer']->substituteDocument($story, $media); $story->set_metadatas($metadatas->toMetadataArray($metadatasStructure), true); @@ -1080,12 +1113,14 @@ class ArchiveJob extends AbstractJob $file->addAttribute(new BorderAttribute\Status($app, $status)); - $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfFilepath(), new MonoValue($media->getFile()->getRealPath())))); - $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfDirname(), new MonoValue(dirname($media->getFile()->getRealPath()))))); + /** @var \MediaVorus\File $mediaFile */ + $mediaFile = $media->getFile(); + $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfFilepath(), new MonoValue($mediaFile->getRealPath())))); + $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfDirname(), new MonoValue(dirname($mediaFile->getRealPath()))))); - $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfAtime(), new MonoValue($media->getFile()->getATime())))); - $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfMtime(), new MonoValue($media->getFile()->getMTime())))); - $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfCtime(), new MonoValue($media->getFile()->getCTime())))); + $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfAtime(), new MonoValue($mediaFile->getATime())))); + $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfMtime(), new MonoValue($mediaFile->getMTime())))); + $file->addAttribute(new BorderAttribute\Metadata(new Metadata(new PhraseaTag\TfCtime(), new MonoValue($mediaFile->getCTime())))); foreach ($metadatas as $meta) { $file->addAttribute(new BorderAttribute\Metadata($meta)); @@ -1102,8 +1137,13 @@ class ArchiveJob extends AbstractJob $record = null; $postProcess = function ($element, $visa, $code) use (&$record) { - $record = $element; - }; + $r = isset($visa); // one way to avoid "variable not used" with phpstorm 10. ugly. + unset($r); // + $r = isset($code); // one way to avoid "variable not used" with phpstorm 10. ugly. + unset($r); // + + $record = $element; + }; /** @var borderManager $borderManager */ $borderManager = $app['border-manager']; @@ -1206,12 +1246,13 @@ class ArchiveJob extends AbstractJob } } - $this->archiveFileAndCaption($app, $databox, $dom, $node, $captionFileNode, $path, $path_archived, $path_error, $grp_rid, $nodesToDel, $stat0, $stat1, $moveError, $moveArchived); + $this->archiveFileAndCaption($app, $databox, $node, $captionFileNode, $path, $path_archived, $path_error, $grp_rid, $nodesToDel, $stat0, $stat1, $moveError, $moveArchived); } /** * - * @param \DOMDOcument $dom + * @param Application $app + * @param \databox $databox * @param \DOMElement $node * @param \DOMElement $captionFileNode * @param string $path @@ -1219,8 +1260,12 @@ class ArchiveJob extends AbstractJob * @param string $path_error * @param integer $grp_rid * @param array $nodesToDel out, filled with files to delete + * @param $stat0 + * @param $stat1 + * @param $moveError + * @param $moveArchived */ - private function archiveFileAndCaption(Application $app, \databox $databox, \DOMDocument $dom, \DOMElement $node, \DOMElement $captionFileNode = null, $path, $path_archived, $path_error, $grp_rid, array &$nodesToDel, $stat0, $stat1, $moveError, $moveArchived) + private function archiveFileAndCaption(Application $app, \databox $databox, \DOMElement $node, \DOMElement $captionFileNode = null, $path, $path_archived, $path_error, $grp_rid, array &$nodesToDel, $stat0, $stat1, $moveError, $moveArchived) { // quick fix to reconnect if mysql is lost $app->getApplicationBox()->get_connection(); @@ -1422,6 +1467,7 @@ class ArchiveJob extends AbstractJob { $ret = new MetadataBag(); + /** @var \databox_field $databox_field */ foreach ($metadatasStructure as $databox_field) { if ($bag->containsKey($databox_field->get_tag()->getTagname())) { $ret->set($databox_field->get_name(), $bag->get($databox_field->get_tag()->getTagname())); diff --git a/lib/classes/databox/status.php b/lib/classes/databox/status.php index 744041e034..397f1eacea 100644 --- a/lib/classes/databox/status.php +++ b/lib/classes/databox/status.php @@ -157,8 +157,8 @@ class databox_status * compute ((0 M s1) M s2) where M is the "mask" operator * nb : s1,s2 are binary mask strings as "01x0xx1xx0x", no other format (hex) supported * - * @param $stat1 a binary mask "010x1xx0.." STRING - * @param $stat2 a binary mask "x100x1..." STRING + * @param string $stat1 a binary mask "010x1xx0.." + * @param string $stat2 a binary mask "x100x1..." * * @return string */ From 7ca0d9dd6614b9ebb4cf5a4f74e37abe5e46c09d Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 22 May 2020 16:15:50 +0400 Subject: [PATCH 05/19] PHRAS-3082 add string translation --- resources/locales/messages.de.xlf | 79 ++++++++++++------- resources/locales/messages.en.xlf | 79 ++++++++++++------- resources/locales/messages.fr.xlf | 79 ++++++++++++------- resources/locales/messages.nl.xlf | 79 ++++++++++++------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../web/admin/worker-manager/index.html.twig | 14 ++-- .../worker-manager/worker_info.html.twig | 2 +- .../worker-manager/worker_metadata.html.twig | 2 +- .../worker_pull_assets.html.twig | 2 +- .../worker_searchengine.html.twig | 2 +- .../worker-manager/worker_subview.html.twig | 2 +- 14 files changed, 212 insertions(+), 136 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index d1caf25cc7..933fee4e16 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. @@ -1924,7 +1924,6 @@ Configuration Konfiguration web/prod/index.html.twig - admin/worker-manager/index.html.twig Confirm new email address @@ -4379,11 +4378,6 @@ Phraseanet Automatische Meldung templates/web/email-template.html.twig - - Metadata - Metadata - admin/worker-manager/index.html.twig - Metadatas retry delay in ms Metadatas retry delay in ms @@ -5324,11 +5318,6 @@ Veröffentlicher Form/Configuration/ActionsFormType.php - - Pull Assets - Pull Assets - admin/worker-manager/index.html.twig - Push Push @@ -6042,11 +6031,6 @@ web/setup/step2.html.twig web/admin/tree.html.twig - - Searchengine - Searchengine - admin/worker-manager/index.html.twig - Security Sicherheit @@ -6518,11 +6502,6 @@ Für diesen Typ von Aufnahme ist die Ersetzung nicht verfügbar actions/Tools/index.html.twig - - Subview - Subview - admin/worker-manager/index.html.twig - Success Erfolg @@ -7769,11 +7748,6 @@ Worker Manager web/admin/tree.html.twig - - Working info - Working info - admin/worker-manager/index.html.twig - Would you like to continue ? Möchten Sie, fortzufahren? @@ -9210,15 +9184,40 @@ web/admin/tree.html.twig web/admin/connected-users.html.twig + + admin::workermanager: Rabbit config error + admin::workermanager: Rabbit config error + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:configuration: title + admin::workermanager:tab:configuration: title + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:metadata: description + admin::workermanager:tab:metadata: description + admin/worker-manager/worker_metadata.html.twig + + + admin::workermanager:tab:metadata: title + admin::workermanager:tab:metadata: title + admin/worker-manager/index.html.twig + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets admin/worker-manager/worker_pull_assets.html.twig + + admin::workermanager:tab:pullassets: description + admin::workermanager:tab:pullassets: description + admin/worker-manager/worker_pull_assets.html.twig + admin::workermanager:tab:pullassets: title admin::workermanager:tab:pullassets: title - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9235,10 +9234,25 @@ admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: description + admin::workermanager:tab:searchengine: description + admin/worker-manager/worker_searchengine.html.twig + admin::workermanager:tab:searchengine: title admin::workermanager:tab:searchengine: title - admin/worker-manager/worker_searchengine.html.twig + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:subview: description + admin::workermanager:tab:subview: description + admin/worker-manager/worker_subview.html.twig + + + admin::workermanager:tab:subview: title + admin::workermanager:tab:subview: title + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9300,6 +9314,11 @@ admin::workermanager:tab:workerinfo: databox_id admin/worker-manager/worker_info.html.twig + + admin::workermanager:tab:workerinfo: description + admin::workermanager:tab:workerinfo: description + admin/worker-manager/worker_info.html.twig + admin::workermanager:tab:workerinfo: published admin::workermanager:tab:workerinfo: published @@ -9318,7 +9337,7 @@ admin::workermanager:tab:workerinfo: title admin::workermanager:tab:workerinfo: title - admin/worker-manager/worker_info.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerinfo: work diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 9e07448ae5..d7f9482508 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.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. @@ -1926,7 +1926,6 @@ Configuration Configuration web/prod/index.html.twig - admin/worker-manager/index.html.twig Confirm new email address @@ -4382,11 +4381,6 @@ Automatic message from Phraseanet templates/web/email-template.html.twig - - Metadata - Metadata - admin/worker-manager/index.html.twig - Metadatas retry delay in ms Metadatas retry delay in ms @@ -5327,11 +5321,6 @@ Publishers Form/Configuration/ActionsFormType.php - - Pull Assets - Pull Assets - admin/worker-manager/index.html.twig - Push Push @@ -6045,11 +6034,6 @@ web/setup/step2.html.twig web/admin/tree.html.twig - - Searchengine - Searchengine - admin/worker-manager/index.html.twig - Security Security @@ -6521,11 +6505,6 @@ Substitution is not possible for this record type actions/Tools/index.html.twig - - Subview - Subview - admin/worker-manager/index.html.twig - Success Success @@ -7772,11 +7751,6 @@ Worker Manager web/admin/tree.html.twig - - Working info - Working info - admin/worker-manager/index.html.twig - Would you like to continue ? Would you like to continue? @@ -9213,15 +9187,40 @@ web/admin/tree.html.twig web/admin/connected-users.html.twig + + admin::workermanager: Rabbit config error + admin::workermanager: Rabbit config error + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:configuration: title + admin::workermanager:tab:configuration: title + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:metadata: description + admin::workermanager:tab:metadata: description + admin/worker-manager/worker_metadata.html.twig + + + admin::workermanager:tab:metadata: title + admin::workermanager:tab:metadata: title + admin/worker-manager/index.html.twig + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets admin/worker-manager/worker_pull_assets.html.twig + + admin::workermanager:tab:pullassets: description + admin::workermanager:tab:pullassets: description + admin/worker-manager/worker_pull_assets.html.twig + admin::workermanager:tab:pullassets: title admin::workermanager:tab:pullassets: title - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9238,10 +9237,25 @@ admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: description + admin::workermanager:tab:searchengine: description + admin/worker-manager/worker_searchengine.html.twig + admin::workermanager:tab:searchengine: title admin::workermanager:tab:searchengine: title - admin/worker-manager/worker_searchengine.html.twig + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:subview: description + admin::workermanager:tab:subview: description + admin/worker-manager/worker_subview.html.twig + + + admin::workermanager:tab:subview: title + admin::workermanager:tab:subview: title + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9303,6 +9317,11 @@ admin::workermanager:tab:workerinfo: databox_id admin/worker-manager/worker_info.html.twig + + admin::workermanager:tab:workerinfo: description + admin::workermanager:tab:workerinfo: description + admin/worker-manager/worker_info.html.twig + admin::workermanager:tab:workerinfo: published admin::workermanager:tab:workerinfo: published @@ -9321,7 +9340,7 @@ admin::workermanager:tab:workerinfo: title admin::workermanager:tab:workerinfo: title - admin/worker-manager/worker_info.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerinfo: work diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 3409de0f3c..216ab2cb5e 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.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. @@ -1924,7 +1924,6 @@ Configuration Configuration web/prod/index.html.twig - admin/worker-manager/index.html.twig Confirm new email address @@ -4379,11 +4378,6 @@ Message automatique de Phraseanet templates/web/email-template.html.twig - - Metadata - Metadata - admin/worker-manager/index.html.twig - Metadatas retry delay in ms Metadatas retry delay in ms @@ -5324,11 +5318,6 @@ Editeurs Form/Configuration/ActionsFormType.php - - Pull Assets - Pull Assets - admin/worker-manager/index.html.twig - Push Push @@ -6044,11 +6033,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/setup/step2.html.twig web/admin/tree.html.twig - - Searchengine - Searchengine - admin/worker-manager/index.html.twig - Security Sécurité @@ -6520,11 +6504,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis La substitution de ce type d'enregistrement n'est pas possible actions/Tools/index.html.twig - - Subview - Subview - admin/worker-manager/index.html.twig - Success Succès @@ -7771,11 +7750,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Worker Manager web/admin/tree.html.twig - - Working info - Working info - admin/worker-manager/index.html.twig - Would you like to continue ? Voulez-vous continuer ? @@ -9213,15 +9187,40 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/admin/tree.html.twig web/admin/connected-users.html.twig + + admin::workermanager: Rabbit config error + admin::workermanager: Rabbit config error + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:configuration: title + admin::workermanager:tab:configuration: title + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:metadata: description + admin::workermanager:tab:metadata: description + admin/worker-manager/worker_metadata.html.twig + + + admin::workermanager:tab:metadata: title + admin::workermanager:tab:metadata: title + admin/worker-manager/index.html.twig + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets admin/worker-manager/worker_pull_assets.html.twig + + admin::workermanager:tab:pullassets: description + admin::workermanager:tab:pullassets: description + admin/worker-manager/worker_pull_assets.html.twig + admin::workermanager:tab:pullassets: title admin::workermanager:tab:pullassets: title - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9238,10 +9237,25 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: description + admin::workermanager:tab:searchengine: description + admin/worker-manager/worker_searchengine.html.twig + admin::workermanager:tab:searchengine: title admin::workermanager:tab:searchengine: title - admin/worker-manager/worker_searchengine.html.twig + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:subview: description + admin::workermanager:tab:subview: description + admin/worker-manager/worker_subview.html.twig + + + admin::workermanager:tab:subview: title + admin::workermanager:tab:subview: title + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9303,6 +9317,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: databox_id admin/worker-manager/worker_info.html.twig + + admin::workermanager:tab:workerinfo: description + admin::workermanager:tab:workerinfo: description + admin/worker-manager/worker_info.html.twig + admin::workermanager:tab:workerinfo: published admin::workermanager:tab:workerinfo: published @@ -9321,7 +9340,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: title admin::workermanager:tab:workerinfo: title - admin/worker-manager/worker_info.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerinfo: work diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 3fc3151413..1841f056b1 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. @@ -1930,7 +1930,6 @@ Configuration Configuratie web/prod/index.html.twig - admin/worker-manager/index.html.twig Confirm new email address @@ -4389,11 +4388,6 @@ Automatishe melding van Phraseanet templates/web/email-template.html.twig - - Metadata - Metadata - admin/worker-manager/index.html.twig - Metadatas retry delay in ms Metadatas retry delay in ms @@ -5334,11 +5328,6 @@ Uitgevers Form/Configuration/ActionsFormType.php - - Pull Assets - Pull Assets - admin/worker-manager/index.html.twig - Push Push @@ -6052,11 +6041,6 @@ web/setup/step2.html.twig web/admin/tree.html.twig - - Searchengine - Searchengine - admin/worker-manager/index.html.twig - Security Beveiliging @@ -6528,11 +6512,6 @@ Vervanging is niet mogelijk voor dit soort van record actions/Tools/index.html.twig - - Subview - Subview - admin/worker-manager/index.html.twig - Success Gelukt @@ -7779,11 +7758,6 @@ Worker Manager web/admin/tree.html.twig - - Working info - Working info - admin/worker-manager/index.html.twig - Would you like to continue ? Wilt u verdergaan? @@ -9220,15 +9194,40 @@ web/admin/tree.html.twig web/admin/connected-users.html.twig + + admin::workermanager: Rabbit config error + admin::workermanager: Rabbit config error + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:configuration: title + admin::workermanager:tab:configuration: title + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:metadata: description + admin::workermanager:tab:metadata: description + admin/worker-manager/worker_metadata.html.twig + + + admin::workermanager:tab:metadata: title + admin::workermanager:tab:metadata: title + admin/worker-manager/index.html.twig + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets admin/worker-manager/worker_pull_assets.html.twig + + admin::workermanager:tab:pullassets: description + admin::workermanager:tab:pullassets: description + admin/worker-manager/worker_pull_assets.html.twig + admin::workermanager:tab:pullassets: title admin::workermanager:tab:pullassets: title - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9245,10 +9244,25 @@ admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: description + admin::workermanager:tab:searchengine: description + admin/worker-manager/worker_searchengine.html.twig + admin::workermanager:tab:searchengine: title admin::workermanager:tab:searchengine: title - admin/worker-manager/worker_searchengine.html.twig + admin/worker-manager/index.html.twig + + + admin::workermanager:tab:subview: description + admin::workermanager:tab:subview: description + admin/worker-manager/worker_subview.html.twig + + + admin::workermanager:tab:subview: title + admin::workermanager:tab:subview: title + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9310,6 +9324,11 @@ admin::workermanager:tab:workerinfo: databox_id admin/worker-manager/worker_info.html.twig + + admin::workermanager:tab:workerinfo: description + admin::workermanager:tab:workerinfo: description + admin/worker-manager/worker_info.html.twig + admin::workermanager:tab:workerinfo: published admin::workermanager:tab:workerinfo: published @@ -9328,7 +9347,7 @@ admin::workermanager:tab:workerinfo: title admin::workermanager:tab:workerinfo: title - admin/worker-manager/worker_info.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerinfo: work diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index c607ba6bfa..105e5e94e8 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 51866ae6a3..7ee3a13e9f 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 07ff2cc9da..44baac05ab 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 be8ceb2799..9977f6b43c 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/admin/worker-manager/index.html.twig b/templates/web/admin/worker-manager/index.html.twig index 4d25cfccab..19c4270d35 100644 --- a/templates/web/admin/worker-manager/index.html.twig +++ b/templates/web/admin/worker-manager/index.html.twig @@ -7,32 +7,32 @@ @@ -86,6 +86,6 @@ {% else %}

    - Error! can't load rabbit config. Check rabbit config to use worker. + {{ 'admin::workermanager: Rabbit config error' |trans }}

    {% endif %} diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig index 12cd3c7dc5..c23ba6383c 100644 --- a/templates/web/admin/worker-manager/worker_info.html.twig +++ b/templates/web/admin/worker-manager/worker_info.html.twig @@ -1,6 +1,6 @@ {% if not reload %} -

    {{ 'admin::workermanager:tab:workerinfo: title' |trans }}

    +

    {{ 'admin::workermanager:tab:workerinfo: description' |trans }}

    diff --git a/templates/web/admin/worker-manager/worker_metadata.html.twig b/templates/web/admin/worker-manager/worker_metadata.html.twig index 0193dbdb53..c3d4af1681 100644 --- a/templates/web/admin/worker-manager/worker_metadata.html.twig +++ b/templates/web/admin/worker-manager/worker_metadata.html.twig @@ -1 +1 @@ -

    admin::workermanager:tab:metadata: title

    +

    {{ 'admin::workermanager:tab:metadata: description' |trans }}

    diff --git a/templates/web/admin/worker-manager/worker_pull_assets.html.twig b/templates/web/admin/worker-manager/worker_pull_assets.html.twig index 1e2d3fd68a..91b4116ca2 100644 --- a/templates/web/admin/worker-manager/worker_pull_assets.html.twig +++ b/templates/web/admin/worker-manager/worker_pull_assets.html.twig @@ -1,4 +1,4 @@ -

    {{ 'admin::workermanager:tab:pullassets: title' |trans }}

    +

    {{ 'admin::workermanager:tab:pullassets: description' |trans }}

    {{ form_start(form, {'action': path('worker_admin_pullAssets')}) }} diff --git a/templates/web/admin/worker-manager/worker_searchengine.html.twig b/templates/web/admin/worker-manager/worker_searchengine.html.twig index 1a30042c98..094506c963 100644 --- a/templates/web/admin/worker-manager/worker_searchengine.html.twig +++ b/templates/web/admin/worker-manager/worker_searchengine.html.twig @@ -1,4 +1,4 @@ -

    {{ 'admin::workermanager:tab:searchengine: title' |trans }}

    +

    {{ 'admin::workermanager:tab:searchengine: description' |trans }}

    {{ form_start(form, {'action': path('worker_admin_searchengine')}) }} diff --git a/templates/web/admin/worker-manager/worker_subview.html.twig b/templates/web/admin/worker-manager/worker_subview.html.twig index 01b7cccb21..1d7cf53981 100644 --- a/templates/web/admin/worker-manager/worker_subview.html.twig +++ b/templates/web/admin/worker-manager/worker_subview.html.twig @@ -1 +1 @@ -

    admin::workermanager:tab:subview: title

    +

    {{ 'admin::workermanager:tab:subview: description' |trans }}

    From d382b718e46b7f3320f3ae892d3953f78b255cb8 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 22 May 2020 19:48:13 +0400 Subject: [PATCH 06/19] PHRAS-3084 --- templates/web/admin/editusers.html.twig | 53 +++++++++++++++++++++---- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index b80cb30b7f..39e9b5a3bf 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -320,22 +320,26 @@
    -
    - - - - + {% endif %} - + @@ -424,7 +428,12 @@ {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::COLL_MODIFY_STRUCT'), users, 'base')}} {% endfor %} @@ -1099,6 +1108,36 @@ }); } }); + + $('.select-all-bdd-right').click(function () { + $('.main-right-item > div').removeClass('unchecked').addClass('checked'); + $('.main-right-item > div > input').val(1); + }); + + $('.select-all-bdd').click(function () { + $(this).closest('.right-items').find('div').show().removeClass('unchecked').addClass('checked'); + $(this).closest('.right-items').find('input').val(1); + $(this).closest('.right-items').find('.unselect-all-bdd').removeClass('hide'); + $(this).addClass('hide'); + }); + $('.unselect-all-bdd').click(function () { + $(this).closest('.right-items').find('div').hide().addClass('unchecked').remove('checked'); + $(this).closest('.right-items').find('.case_right_access div').show(); + $(this).closest('.right-items').find('input').val(0); + $(this).closest('.right-items').find('.select-all-bdd').removeClass('hide'); + $(this).addClass('hide'); + }); + + function countCheckedRight() { + $(".right-items" ).each(function() { + let count_checked = $( this ).find('input.checked').length; + if ( count_checked == 17) { + $(this).find('.select-all-bdd').addClass('hide'); + $(this).find('.unselect-all-bdd').removeClass('hide'); + } + }); + }; + countCheckedRight(); }); require([ From 8dbf5e1c5898df313ffca1b7fc74714c08966367 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 22 May 2020 23:42:49 +0000 Subject: [PATCH 07/19] Translated using Weblate (English) Currently translated at 97.8% (2501 of 2557 strings) --- resources/locales/messages.en.xlf | 158 +++++++++++++++--------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index d7f9482508..c0ca910c68 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,4 +1,4 @@ - +
    @@ -7,8 +7,8 @@
    - - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -9187,174 +9187,174 @@ web/admin/tree.html.twig web/admin/connected-users.html.twig - + admin::workermanager: Rabbit config error - admin::workermanager: Rabbit config error + Message Queue configuration error admin/worker-manager/index.html.twig - + admin::workermanager:tab:configuration: title - admin::workermanager:tab:configuration: title + Setting admin/worker-manager/index.html.twig - + admin::workermanager:tab:metadata: description - admin::workermanager:tab:metadata: description + Write Meta datas into assets admin/worker-manager/worker_metadata.html.twig - + admin::workermanager:tab:metadata: title - admin::workermanager:tab:metadata: title + Metadata admin/worker-manager/index.html.twig - + admin::workermanager:tab:pullassets: Initialize pull assets - admin::workermanager:tab:pullassets: Initialize pull assets + Launch pull assets admin/worker-manager/worker_pull_assets.html.twig - + admin::workermanager:tab:pullassets: description - admin::workermanager:tab:pullassets: description + Uploader Pull mode setting admin/worker-manager/worker_pull_assets.html.twig - + admin::workermanager:tab:pullassets: title - admin::workermanager:tab:pullassets: title + Pull assets setting admin/worker-manager/index.html.twig - + admin::workermanager:tab:searchengine: Databox to populate - admin::workermanager:tab:searchengine: Databox to populate + Databox to populate admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: Populate - admin::workermanager:tab:searchengine: Populate + Indexing admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox - admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox + Warning! A indexing is in process on one of the selected Databox. You can't launch a second one until the first is not finish. admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: description - admin::workermanager:tab:searchengine: description + Launch Manually indexing on Databox. admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: title - admin::workermanager:tab:searchengine: title + Indexing admin/worker-manager/index.html.twig - + admin::workermanager:tab:subview: description - admin::workermanager:tab:subview: description + Sub definition Job admin/worker-manager/worker_subview.html.twig - + admin::workermanager:tab:subview: title - admin::workermanager:tab:subview: title + Sub definition admin/worker-manager/index.html.twig - + admin::workermanager:tab:workerconfig: title - admin::workermanager:tab:workerconfig: title + Main setting admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerconfig: warning - admin::workermanager:tab:workerconfig: warning + The queues need to be destroyed to take account of new time intervals admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerconfig:Apply in queue - admin::workermanager:tab:workerconfig:Apply in queue + Apply in queue admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerinfo: Display finished work - admin::workermanager:tab:workerinfo: Display finished work + Display Finished Job(s) admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Display running work - admin::workermanager:tab:workerinfo: Display running work + Display Running Job(s) admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Erase all finished - admin::workermanager:tab:workerinfo: Erase all finished + Clear Finished Job admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Erase all information - admin::workermanager:tab:workerinfo: Erase all information + Clear all admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Refresh list - admin::workermanager:tab:workerinfo: Refresh list + Refresh list admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Warning! Erase all finished - admin::workermanager:tab:workerinfo: Warning! Erase all finished + Warning! Erase line about finished Job admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Warning! Erase all information - admin::workermanager:tab:workerinfo: Warning! Erase all information + Warning! This is erased all jobs log include actual running job(s). admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: created - admin::workermanager:tab:workerinfo: created + Job starting admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: databox_id - admin::workermanager:tab:workerinfo: databox_id + Base ID admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: description - admin::workermanager:tab:workerinfo: description + Job running informations admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: published - admin::workermanager:tab:workerinfo: published + Publishing Date admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: record_id - admin::workermanager:tab:workerinfo: record_id + Record ID admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: status - admin::workermanager:tab:workerinfo: status + Status admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: title - admin::workermanager:tab:workerinfo: title + Job Info admin/worker-manager/index.html.twig - + admin::workermanager:tab:workerinfo: work - admin::workermanager:tab:workerinfo: work + Job kind admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: work_on - admin::workermanager:tab:workerinfo: work_on + Work On admin/worker-manager/worker_info.html.twig - + admin:worker Retrieve configuration error - admin:worker Retrieve configuration error + Worker Retrieve configuration error admin/worker-manager/index.html.twig @@ -12134,27 +12134,27 @@ It is possible to place several search areas actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : subtitle alert - publication : subtitle alert + Characters > 1024 actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : subtitle warning - publication : subtitle warning + 1024 Characters Max actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : title alert - publication : title alert + Characters > 128 actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : title warning - publication : title warning + 128 Characters Max actions/publish/publish.html.twig actions/publish/publish_edit.html.twig From 56d65f6d9f7ec08d3a403badafa13fc1842d4c07 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 22 May 2020 23:35:30 +0000 Subject: [PATCH 08/19] Translated using Weblate (French) Currently translated at 97.7% (2500 of 2557 strings) --- resources/locales/messages.fr.xlf | 158 +++++++++++++++--------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 216ab2cb5e..79c7dc55cf 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,4 +1,4 @@ - +
    @@ -7,8 +7,8 @@
    - - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -6776,9 +6776,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Les erreurs suivantes ont été détectées. user/import/view.html.twig     - + The provided date is null! - La date fournie est NULL (vide) + La date fournie est NULL (vide) Controller/Prod/PushController.php @@ -9187,84 +9187,84 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/admin/tree.html.twig web/admin/connected-users.html.twig - + admin::workermanager: Rabbit config error - admin::workermanager: Rabbit config error + Erreur dans la configuration du gestionnaire de messages admin/worker-manager/index.html.twig - + admin::workermanager:tab:configuration: title - admin::workermanager:tab:configuration: title + Réglages généraux admin/worker-manager/index.html.twig - + admin::workermanager:tab:metadata: description - admin::workermanager:tab:metadata: description + Ecriture des méta-données admin/worker-manager/worker_metadata.html.twig - + admin::workermanager:tab:metadata: title - admin::workermanager:tab:metadata: title + Méta-données admin/worker-manager/index.html.twig - + admin::workermanager:tab:pullassets: Initialize pull assets - admin::workermanager:tab:pullassets: Initialize pull assets + Lancer le processus. admin/worker-manager/worker_pull_assets.html.twig - + admin::workermanager:tab:pullassets: description - admin::workermanager:tab:pullassets: description + Reglage de l'Uploader en Mode "Pull" admin/worker-manager/worker_pull_assets.html.twig - + admin::workermanager:tab:pullassets: title - admin::workermanager:tab:pullassets: title + Pull assets admin/worker-manager/index.html.twig - + admin::workermanager:tab:searchengine: Databox to populate - admin::workermanager:tab:searchengine: Databox to populate + Sélectionner les databox(s) admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: Populate - admin::workermanager:tab:searchengine: Populate + Indexation admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox - admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox + Un processus d'indexation est en cours pour une des databox sélectionnées, vous ne pouvez pas en lancer un second tant que le premier n'est pas finit. admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: description - admin::workermanager:tab:searchengine: description + Lancement manuel de processus d'indexation admin/worker-manager/worker_searchengine.html.twig - + admin::workermanager:tab:searchengine: title - admin::workermanager:tab:searchengine: title + Indexation admin/worker-manager/index.html.twig - + admin::workermanager:tab:subview: description - admin::workermanager:tab:subview: description + Fabrication de sous-définition admin/worker-manager/worker_subview.html.twig - + admin::workermanager:tab:subview: title - admin::workermanager:tab:subview: title + Sous-définition admin/worker-manager/index.html.twig - + admin::workermanager:tab:workerconfig: title - admin::workermanager:tab:workerconfig: title + Réglage Généraux des workers. admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerconfig: warning - admin::workermanager:tab:workerconfig: warning + Il est nécéssaire de détruire les files de message pour la prise en compte des nouveaux intervalles. admin/worker-manager/worker_configuration.html.twig @@ -9272,89 +9272,89 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerconfig:Apply in queue admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerinfo: Display finished work - admin::workermanager:tab:workerinfo: Display finished work + Afficher les travaux terminés admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Display running work - admin::workermanager:tab:workerinfo: Display running work + Affiché les travaux en cours. admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Erase all finished - admin::workermanager:tab:workerinfo: Erase all finished + Effacer les travaux terminés. admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Erase all information - admin::workermanager:tab:workerinfo: Erase all information + Effacer Tout les travaux admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Refresh list - admin::workermanager:tab:workerinfo: Refresh list + Rafraichir la liste admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Warning! Erase all finished - admin::workermanager:tab:workerinfo: Warning! Erase all finished + Effacer tout les travaux terminée. admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: Warning! Erase all information - admin::workermanager:tab:workerinfo: Warning! Erase all information + Effacer toutes les informations, cette action ne doit être effectuer que pour supprimer des travaux bloqué. Effectuer cette action de façons non pertinentes peut avoir un impact quand certains travaux on une interdépendance, exemple: Génération des sous definition et écriture de méta-données dans ces sous définitions. admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: created - admin::workermanager:tab:workerinfo: created + Démarrage admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: databox_id - admin::workermanager:tab:workerinfo: databox_id + Databox Id admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: description - admin::workermanager:tab:workerinfo: description + Journal des travaux admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: published - admin::workermanager:tab:workerinfo: published + Publié admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: record_id - admin::workermanager:tab:workerinfo: record_id + Record ID admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: status - admin::workermanager:tab:workerinfo: status + Etat admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: title - admin::workermanager:tab:workerinfo: title + Suivis admin/worker-manager/index.html.twig - + admin::workermanager:tab:workerinfo: work - admin::workermanager:tab:workerinfo: work + Type admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: work_on - admin::workermanager:tab:workerinfo: work_on + Objet admin/worker-manager/worker_info.html.twig - + admin:worker Retrieve configuration error - admin:worker Retrieve configuration error + worker Retrieve configuration error admin/worker-manager/index.html.twig @@ -12137,27 +12137,27 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : subtitle alert - publication : subtitle alert + Nombre de caractères > 1024 actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : subtitle warning - publication : subtitle warning + 1024 Caractères Max actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : title alert - publication : title alert + Nombre de caractères > 128 actions/publish/publish.html.twig actions/publish/publish_edit.html.twig - + publication : title warning - publication : title warning + 128 Caractères Max actions/publish/publish.html.twig actions/publish/publish_edit.html.twig From 0a079d77aff03e2380093ecd69b6ef1a72a48018 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Sat, 23 May 2020 00:06:13 +0000 Subject: [PATCH 09/19] Translated using Weblate (English) Currently translated at 97.8% (2501 of 2557 strings) --- resources/locales/messages.en.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index c0ca910c68..7f86cd11de 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -9219,7 +9219,7 @@ admin::workermanager:tab:pullassets: title - Pull assets setting + Uploader admin/worker-manager/index.html.twig From 0faf212e30f9d7ca15d84cabd3910d056140269b Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Sat, 23 May 2020 00:05:20 +0000 Subject: [PATCH 10/19] Translated using Weblate (French) Currently translated at 97.7% (2500 of 2557 strings) --- resources/locales/messages.fr.xlf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 79c7dc55cf..96c937e87e 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -9219,7 +9219,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:pullassets: title - Pull assets + Uploader admin/worker-manager/index.html.twig @@ -9267,9 +9267,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Il est nécéssaire de détruire les files de message pour la prise en compte des nouveaux intervalles. admin/worker-manager/worker_configuration.html.twig - + admin::workermanager:tab:workerconfig:Apply in queue - admin::workermanager:tab:workerconfig:Apply in queue + Appliqué aux files de messages admin/worker-manager/worker_configuration.html.twig @@ -9304,7 +9304,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: Warning! Erase all information - Effacer toutes les informations, cette action ne doit être effectuer que pour supprimer des travaux bloqué. Effectuer cette action de façons non pertinentes peut avoir un impact quand certains travaux on une interdépendance, exemple: Génération des sous definition et écriture de méta-données dans ces sous définitions. + Attention ! Efface toutes les informations sur travaux finit et en cours. admin/worker-manager/worker_info.html.twig @@ -9349,7 +9349,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: work_on - Objet + Travail sur admin/worker-manager/worker_info.html.twig From c9e448d8fa1d76993b697e0b15e943bf95a68f5c Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 25 May 2020 11:51:11 +0400 Subject: [PATCH 11/19] PHRAS-3082 Add string translation --- .../Form/WorkerConfigurationType.php | 18 +- .../Form/WorkerPullAssetsType.php | 10 +- .../Form/WorkerSearchengineType.php | 6 +- resources/locales/messages.de.xlf | 172 +++++++++--------- resources/locales/messages.en.xlf | 172 +++++++++--------- resources/locales/messages.fr.xlf | 172 +++++++++--------- resources/locales/messages.nl.xlf | 172 +++++++++--------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- 11 files changed, 365 insertions(+), 365 deletions(-) diff --git a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerConfigurationType.php b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerConfigurationType.php index 51a7368413..ccbfd784af 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerConfigurationType.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerConfigurationType.php @@ -14,31 +14,31 @@ class WorkerConfigurationType extends AbstractType $builder ->add(MessagePublisher::ASSETS_INGEST_TYPE, 'text', [ - 'label' => 'Ingest retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Ingest retry delay in ms' ]) ->add(MessagePublisher::CREATE_RECORD_TYPE, 'text', [ - 'label' => 'Create record retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Create record retry delay in ms' ]) ->add(MessagePublisher::SUBDEF_CREATION_TYPE, 'text', [ - 'label' => 'Subdefinition retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms' ]) ->add(MessagePublisher::WRITE_METADATAS_TYPE, 'text', [ - 'label' => 'Metadatas retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Metadatas retry delay in ms' ]) ->add(MessagePublisher::WEBHOOK_TYPE, 'text', [ - 'label' => 'Webhook retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Webhook retry delay in ms' ]) ->add(MessagePublisher::EXPORT_MAIL_TYPE, 'text', [ - 'label' => 'Export mail retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Export mail retry delay in ms' ]) ->add(MessagePublisher::POPULATE_INDEX_TYPE, 'text', [ - 'label' => 'Populate Index retry delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Populate Index retry delay in ms' ]) ->add('delayedSubdef', 'text', [ - 'label' => 'Subdef delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Subdef delay in ms' ]) ->add('delayedWriteMeta', 'text', [ - 'label' => 'Write meta delay in ms' + 'label' => 'admin::workermanager:tab:workerconfig: Write meta delay in ms' ]) ; } diff --git a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php index 1a7ccf69c3..511c3e22c7 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php @@ -13,19 +13,19 @@ class WorkerPullAssetsType extends AbstractType $builder ->add('endpointCommit', 'text', [ - 'label' => 'Endpoint get commit' + 'label' => 'admin::workermanager:tab:pullassets: Endpoint get commit' ]) ->add('endpointToken', 'text', [ - 'label' => 'Endpoint get token' + 'label' => 'admin::workermanager:tab:pullassets: Endpoint get token' ]) ->add('clientSecret', 'text', [ - 'label' => 'Client secret' + 'label' => 'admin::workermanager:tab:pullassets: Client secret' ]) ->add('clientId', 'text', [ - 'label' => 'Client ID' + 'label' => 'admin::workermanager:tab:pullassets: Client ID' ]) ->add('pullInterval', 'text', [ - 'label' => 'Fetching interval in second' + 'label' => 'admin::workermanager:tab:pullassets: Fetching interval in second' ]) ; } diff --git a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerSearchengineType.php b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerSearchengineType.php index a3c732c5b1..2f86bdda7a 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerSearchengineType.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerSearchengineType.php @@ -16,18 +16,18 @@ class WorkerSearchengineType extends AbstractType $builder ->add('host', 'text', [ - 'label' => 'Elasticsearch server host', + 'label' => 'admin::workermanager:tab:searchengine: Elasticsearch server host', 'constraints' => new NotBlank(), ]) ->add('port', 'integer', [ - 'label' => 'Elasticsearch service port', + 'label' => 'admin::workermanager:tab:searchengine: Elasticsearch service port', 'constraints' => [ new Range(['min' => 1, 'max' => 65535]), new NotBlank() ] ]) ->add('indexName', 'text', [ - 'label' => 'Elasticsearch index name', + 'label' => 'admin::workermanager:tab:searchengine: Elasticsearch index name', 'constraints' => new NotBlank(), 'attr' =>['data-class'=>'inline'] ]) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 933fee4e16..f2a52024bc 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. @@ -1785,11 +1785,6 @@ prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - - Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - Client application Client Anwendung @@ -1800,11 +1795,6 @@ Client Anwendungen web/developers/applications.html.twig - - Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - Close schliessen @@ -2057,11 +2047,6 @@ Index erstellen SearchEngine/Elastic/ElasticsearchSettingsFormType.php - - Create record retry delay in ms - Create record retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Creation date Erstellungsdatum @@ -2779,21 +2764,6 @@ SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig - - Elasticsearch index name - Elasticsearch index name - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch server host - Elasticsearch server host - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch service port - Elasticsearch service port - WorkerManager/Form/WorkerSearchengineType.php - Email Email Adresse @@ -3009,16 +2979,6 @@ Sitzung Aktivität beenden web/account/sessions.html.twig - - Endpoint get commit - Endpoint get commit - WorkerManager/Form/WorkerPullAssetsType.php - - - Endpoint get token - Endpoint get token - WorkerManager/Form/WorkerPullAssetsType.php - Enter your e-mail address to retrieve your password Geben Sie bitte Ihre E-Mail Adresse ein, um Ihr Passwort abzurufen @@ -3214,11 +3174,6 @@ Controller/Prod/DoDownloadController.php Controller/Prod/LanguageController.php - - Export mail retry delay in ms - Export mail retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Export ranges Kapitel exportieren @@ -3268,11 +3223,6 @@ Feeds eventsmanager/notify/feed.php - - Fetching interval in second - Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - Fichier ASCII tabule tabellierte ASCII Datei @@ -3825,11 +3775,6 @@ Informationen web/admin/editusers.html.twig - - Ingest retry delay in ms - Ingest retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Inscription Anmeldung @@ -4378,11 +4323,6 @@ Phraseanet Automatische Meldung templates/web/email-template.html.twig - - Metadatas retry delay in ms - Metadatas retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Mettre a jour aktualisieren @@ -5192,11 +5132,6 @@ Bitte warten Sie, während Dateien, die für den Download versammelt sind, kann dieser Vorgang einige Minuten dauern. actions/Download/prepare.html.twig - - Populate Index retry delay in ms - Populate Index retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Position Funktion @@ -6476,16 +6411,6 @@ Unterauflösung admin/databox/details.html.twig - - Subdef delay in ms - Subdef delay in ms - WorkerManager/Form/WorkerConfigurationType.php - - - Subdefinition retry delay in ms - Subdefinition retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Submit Einreichen @@ -7700,11 +7625,6 @@ swach Controller/Root/LoginController.php - - Webhook retry delay in ms - Webhook retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Webservices connectivity Webservices Konnektivität @@ -7769,11 +7689,6 @@ Meta schreiben web/admin/subdefs.html.twig - - Write meta delay in ms - Write meta delay in ms - WorkerManager/Form/WorkerConfigurationType.php - YYYY-MM-DD JJJJ-MM-TT @@ -9204,6 +9119,31 @@ admin::workermanager:tab:metadata: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: Client ID + admin::workermanager:tab:pullassets: Client ID + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Client secret + admin::workermanager:tab:pullassets: Client secret + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get commit + admin::workermanager:tab:pullassets: Endpoint get commit + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get token + admin::workermanager:tab:pullassets: Endpoint get token + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Fetching interval in second + admin::workermanager:tab:pullassets: Fetching interval in second + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets @@ -9224,6 +9164,21 @@ admin::workermanager:tab:searchengine: Databox to populate admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: Elasticsearch index name + admin::workermanager:tab:searchengine: Elasticsearch index name + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch server host + admin::workermanager:tab:searchengine: Elasticsearch server host + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch service port + admin::workermanager:tab:searchengine: Elasticsearch service port + WorkerManager/Form/WorkerSearchengineType.php + admin::workermanager:tab:searchengine: Populate admin::workermanager:tab:searchengine: Populate @@ -9254,6 +9209,51 @@ admin::workermanager:tab:subview: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:workerconfig: Create record retry delay in ms + admin::workermanager:tab:workerconfig: Create record retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdef delay in ms + admin::workermanager:tab:workerconfig: Subdef delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Write meta delay in ms + admin::workermanager:tab:workerconfig: Write meta delay in ms + WorkerManager/Form/WorkerConfigurationType.php + admin::workermanager:tab:workerconfig: title admin::workermanager:tab:workerconfig: title diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index d7f9482508..9304fa21e1 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.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. @@ -1787,11 +1787,6 @@ prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - - Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - Client application Client application @@ -1802,11 +1797,6 @@ Client applications web/developers/applications.html.twig - - Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - Close Close @@ -2059,11 +2049,6 @@ Create index SearchEngine/Elastic/ElasticsearchSettingsFormType.php - - Create record retry delay in ms - Create record retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Creation date Creation date @@ -2782,21 +2767,6 @@ SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig - - Elasticsearch index name - Elasticsearch index name - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch server host - Elasticsearch server host - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch service port - Elasticsearch service port - WorkerManager/Form/WorkerSearchengineType.php - Email E-mail @@ -3012,16 +2982,6 @@ End session activity web/account/sessions.html.twig - - Endpoint get commit - Endpoint get commit - WorkerManager/Form/WorkerPullAssetsType.php - - - Endpoint get token - Endpoint get token - WorkerManager/Form/WorkerPullAssetsType.php - Enter your e-mail address to retrieve your password Enter your e-mail address to retrieve your password. @@ -3217,11 +3177,6 @@ Controller/Prod/DoDownloadController.php Controller/Prod/LanguageController.php - - Export mail retry delay in ms - Export mail retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Export ranges Export ranges @@ -3271,11 +3226,6 @@ Feeds eventsmanager/notify/feed.php - - Fetching interval in second - Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - Fichier ASCII tabule Tabulated ASCII file @@ -3828,11 +3778,6 @@ Info web/admin/editusers.html.twig - - Ingest retry delay in ms - Ingest retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Inscription Registration @@ -4381,11 +4326,6 @@ Automatic message from Phraseanet templates/web/email-template.html.twig - - Metadatas retry delay in ms - Metadatas retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Mettre a jour Update @@ -5195,11 +5135,6 @@ Please wait while files are being gathered for download. This operation may take a few minutes. actions/Download/prepare.html.twig - - Populate Index retry delay in ms - Populate Index retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Position Position @@ -6479,16 +6414,6 @@ Subview admin/databox/details.html.twig - - Subdef delay in ms - Subdef delay in ms - WorkerManager/Form/WorkerConfigurationType.php - - - Subdefinition retry delay in ms - Subdefinition retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Submit Submit @@ -7703,11 +7628,6 @@ Weak Controller/Root/LoginController.php - - Webhook retry delay in ms - Webhook retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Webservices connectivity Webservices connectivity @@ -7772,11 +7692,6 @@ Write Metadatas web/admin/subdefs.html.twig - - Write meta delay in ms - Write meta delay in ms - WorkerManager/Form/WorkerConfigurationType.php - YYYY-MM-DD YYYY-MM-DD @@ -9207,6 +9122,31 @@ admin::workermanager:tab:metadata: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: Client ID + admin::workermanager:tab:pullassets: Client ID + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Client secret + admin::workermanager:tab:pullassets: Client secret + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get commit + admin::workermanager:tab:pullassets: Endpoint get commit + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get token + admin::workermanager:tab:pullassets: Endpoint get token + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Fetching interval in second + admin::workermanager:tab:pullassets: Fetching interval in second + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets @@ -9227,6 +9167,21 @@ admin::workermanager:tab:searchengine: Databox to populate admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: Elasticsearch index name + admin::workermanager:tab:searchengine: Elasticsearch index name + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch server host + admin::workermanager:tab:searchengine: Elasticsearch server host + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch service port + admin::workermanager:tab:searchengine: Elasticsearch service port + WorkerManager/Form/WorkerSearchengineType.php + admin::workermanager:tab:searchengine: Populate admin::workermanager:tab:searchengine: Populate @@ -9257,6 +9212,51 @@ admin::workermanager:tab:subview: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:workerconfig: Create record retry delay in ms + admin::workermanager:tab:workerconfig: Create record retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdef delay in ms + admin::workermanager:tab:workerconfig: Subdef delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Write meta delay in ms + admin::workermanager:tab:workerconfig: Write meta delay in ms + WorkerManager/Form/WorkerConfigurationType.php + admin::workermanager:tab:workerconfig: title admin::workermanager:tab:workerconfig: title diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 216ab2cb5e..5c7b5a6186 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.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. @@ -1785,11 +1785,6 @@ prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - - Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - Client application Application tierce @@ -1800,11 +1795,6 @@ Applications clientes web/developers/applications.html.twig - - Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - Close Fermer @@ -2057,11 +2047,6 @@ Créer les index SearchEngine/Elastic/ElasticsearchSettingsFormType.php - - Create record retry delay in ms - Create record retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Creation date Date de création @@ -2779,21 +2764,6 @@ SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig - - Elasticsearch index name - Elasticsearch index name - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch server host - Elasticsearch server host - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch service port - Elasticsearch service port - WorkerManager/Form/WorkerSearchengineType.php - Email E-mail @@ -3009,16 +2979,6 @@ Clore la session web/account/sessions.html.twig - - Endpoint get commit - Endpoint get commit - WorkerManager/Form/WorkerPullAssetsType.php - - - Endpoint get token - Endpoint get token - WorkerManager/Form/WorkerPullAssetsType.php - Enter your e-mail address to retrieve your password Entrez votre adresse e-mail pour récupérer votre mot de passe @@ -3214,11 +3174,6 @@ Controller/Prod/DoDownloadController.php Controller/Prod/LanguageController.php - - Export mail retry delay in ms - Export mail retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Export ranges Export ranges @@ -3268,11 +3223,6 @@ Publications eventsmanager/notify/feed.php - - Fetching interval in second - Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - Fichier ASCII tabule Fichier ASCII tabulé @@ -3825,11 +3775,6 @@ Informations web/admin/editusers.html.twig - - Ingest retry delay in ms - Ingest retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Inscription Inscription @@ -4378,11 +4323,6 @@ Message automatique de Phraseanet templates/web/email-template.html.twig - - Metadatas retry delay in ms - Metadatas retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Mettre a jour Mettre à jour @@ -5192,11 +5132,6 @@ Veuillez patienter pendant que vos fichiers sont rassemblés pour le téléchargement. Cette opération peut prendre quelques minutes. actions/Download/prepare.html.twig - - Populate Index retry delay in ms - Populate Index retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Position Poste @@ -6478,16 +6413,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Sous-définition admin/databox/details.html.twig - - Subdef delay in ms - Subdef delay in ms - WorkerManager/Form/WorkerConfigurationType.php - - - Subdefinition retry delay in ms - Subdefinition retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Submit Envoyer @@ -7702,11 +7627,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Faible Controller/Root/LoginController.php - - Webhook retry delay in ms - Webhook retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Webservices connectivity Connexion à des Webservices @@ -7771,11 +7691,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Ecriture des métadonnées web/admin/subdefs.html.twig - - Write meta delay in ms - Write meta delay in ms - WorkerManager/Form/WorkerConfigurationType.php - YYYY-MM-DD AAAA-MM-JJ @@ -9207,6 +9122,31 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:metadata: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: Client ID + admin::workermanager:tab:pullassets: Client ID + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Client secret + admin::workermanager:tab:pullassets: Client secret + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get commit + admin::workermanager:tab:pullassets: Endpoint get commit + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get token + admin::workermanager:tab:pullassets: Endpoint get token + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Fetching interval in second + admin::workermanager:tab:pullassets: Fetching interval in second + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets @@ -9227,6 +9167,21 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:searchengine: Databox to populate admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: Elasticsearch index name + admin::workermanager:tab:searchengine: Elasticsearch index name + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch server host + admin::workermanager:tab:searchengine: Elasticsearch server host + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch service port + admin::workermanager:tab:searchengine: Elasticsearch service port + WorkerManager/Form/WorkerSearchengineType.php + admin::workermanager:tab:searchengine: Populate admin::workermanager:tab:searchengine: Populate @@ -9257,6 +9212,51 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:subview: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:workerconfig: Create record retry delay in ms + admin::workermanager:tab:workerconfig: Create record retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdef delay in ms + admin::workermanager:tab:workerconfig: Subdef delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Write meta delay in ms + admin::workermanager:tab:workerconfig: Write meta delay in ms + WorkerManager/Form/WorkerConfigurationType.php + admin::workermanager:tab:workerconfig: title admin::workermanager:tab:workerconfig: title diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 1841f056b1..441a239e5e 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. @@ -1791,11 +1791,6 @@ prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - - Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - Client application Klant programma @@ -1806,11 +1801,6 @@ Klant programma's web/developers/applications.html.twig - - Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - Close Sluit @@ -2063,11 +2053,6 @@ Create index SearchEngine/Elastic/ElasticsearchSettingsFormType.php - - Create record retry delay in ms - Create record retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Creation date Aanmaakdatum @@ -2786,21 +2771,6 @@ SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig - - Elasticsearch index name - Elasticsearch index name - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch server host - Elasticsearch server host - WorkerManager/Form/WorkerSearchengineType.php - - - Elasticsearch service port - Elasticsearch service port - WorkerManager/Form/WorkerSearchengineType.php - Email Email @@ -3019,16 +2989,6 @@ Einde sessie activiteit web/account/sessions.html.twig - - Endpoint get commit - Endpoint get commit - WorkerManager/Form/WorkerPullAssetsType.php - - - Endpoint get token - Endpoint get token - WorkerManager/Form/WorkerPullAssetsType.php - Enter your e-mail address to retrieve your password Vul uw email adres in om uw paswoord op te halen @@ -3224,11 +3184,6 @@ Controller/Prod/DoDownloadController.php Controller/Prod/LanguageController.php - - Export mail retry delay in ms - Export mail retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Export ranges Export ranges @@ -3278,11 +3233,6 @@ Feeds eventsmanager/notify/feed.php - - Fetching interval in second - Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - Fichier ASCII tabule Fichier ASCII tabel @@ -3835,11 +3785,6 @@ Informaties web/admin/editusers.html.twig - - Ingest retry delay in ms - Ingest retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Inscription Inschrijving @@ -4388,11 +4333,6 @@ Automatishe melding van Phraseanet templates/web/email-template.html.twig - - Metadatas retry delay in ms - Metadatas retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Mettre a jour Update @@ -5202,11 +5142,6 @@ Gelieve te wachten tot uw documenten worden verzameld voor de download, dit kan enkele minuten duren actions/Download/prepare.html.twig - - Populate Index retry delay in ms - Populate Index retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Position Functie @@ -6486,16 +6421,6 @@ Thumbnail admin/databox/details.html.twig - - Subdef delay in ms - Subdef delay in ms - WorkerManager/Form/WorkerConfigurationType.php - - - Subdefinition retry delay in ms - Subdefinition retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Submit Submit @@ -7710,11 +7635,6 @@ Matig Controller/Root/LoginController.php - - Webhook retry delay in ms - Webhook retry delay in ms - WorkerManager/Form/WorkerConfigurationType.php - Webservices connectivity Webservices connectiviteit @@ -7779,11 +7699,6 @@ Schrijf Metas web/admin/subdefs.html.twig - - Write meta delay in ms - Write meta delay in ms - WorkerManager/Form/WorkerConfigurationType.php - YYYY-MM-DD YYYY-MM-DD @@ -9214,6 +9129,31 @@ admin::workermanager:tab:metadata: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: Client ID + admin::workermanager:tab:pullassets: Client ID + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Client secret + admin::workermanager:tab:pullassets: Client secret + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get commit + admin::workermanager:tab:pullassets: Endpoint get commit + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Endpoint get token + admin::workermanager:tab:pullassets: Endpoint get token + WorkerManager/Form/WorkerPullAssetsType.php + + + admin::workermanager:tab:pullassets: Fetching interval in second + admin::workermanager:tab:pullassets: Fetching interval in second + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:pullassets: Initialize pull assets admin::workermanager:tab:pullassets: Initialize pull assets @@ -9234,6 +9174,21 @@ admin::workermanager:tab:searchengine: Databox to populate admin/worker-manager/worker_searchengine.html.twig + + admin::workermanager:tab:searchengine: Elasticsearch index name + admin::workermanager:tab:searchengine: Elasticsearch index name + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch server host + admin::workermanager:tab:searchengine: Elasticsearch server host + WorkerManager/Form/WorkerSearchengineType.php + + + admin::workermanager:tab:searchengine: Elasticsearch service port + admin::workermanager:tab:searchengine: Elasticsearch service port + WorkerManager/Form/WorkerSearchengineType.php + admin::workermanager:tab:searchengine: Populate admin::workermanager:tab:searchengine: Populate @@ -9264,6 +9219,51 @@ admin::workermanager:tab:subview: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:workerconfig: Create record retry delay in ms + admin::workermanager:tab:workerconfig: Create record retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + admin::workermanager:tab:workerconfig: Export mail retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + admin::workermanager:tab:workerconfig: Ingest retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + admin::workermanager:tab:workerconfig: Metadatas retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + admin::workermanager:tab:workerconfig: Populate Index retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdef delay in ms + admin::workermanager:tab:workerconfig: Subdef delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + admin::workermanager:tab:workerconfig: Subdefinition retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + admin::workermanager:tab:workerconfig: Webhook retry delay in ms + WorkerManager/Form/WorkerConfigurationType.php + + + admin::workermanager:tab:workerconfig: Write meta delay in ms + admin::workermanager:tab:workerconfig: Write meta delay in ms + WorkerManager/Form/WorkerConfigurationType.php + admin::workermanager:tab:workerconfig: title admin::workermanager:tab:workerconfig: title diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 105e5e94e8..da71363bbf 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 7ee3a13e9f..a998a9d378 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 44baac05ab..3e34b96ddc 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 9977f6b43c..5d501d54b3 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. From ee3581c92532134c343056c3a7f9369ddd4f985b Mon Sep 17 00:00:00 2001 From: aynsix Date: Mon, 25 May 2020 12:35:28 +0300 Subject: [PATCH 12/19] removed phpexiftool/exiftool unused in composer.lock --- composer.lock | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/composer.lock b/composer.lock index b40c8a1ccc..9f559ecf9e 100644 --- a/composer.lock +++ b/composer.lock @@ -8055,39 +8055,6 @@ ], "time": "2016-11-25T06:54:22+00:00" }, - { - "name": "phpexiftool/exiftool", - "version": "10.10", - "source": { - "type": "git", - "url": "https://github.com/alchemy-fr/exiftool.git", - "reference": "0833cab894c890353192a83011428525a318bedf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/0833cab894c890353192a83011428525a318bedf", - "reference": "0833cab894c890353192a83011428525a318bedf", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Perl Licensing" - ], - "authors": [ - { - "name": "Phil Harvey", - "email": "phil@owl.phy.queensu.ca", - "homepage": "http://www.sno.phy.queensu.ca/~phil/exiftool/" - } - ], - "description": "Exiftool is a library for reading, writing and editing meta information. This package is not PHP, but required for the main PHP driver : PHP Exiftool", - "keywords": [ - "exiftool", - "metadatas" - ], - "time": "2016-01-25T11:10:14+00:00" - }, { "name": "phpspec/prophecy", "version": "v1.6.2", From bfe82f1cd2c13375222d790bdb45dd0be2b038b3 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 25 May 2020 16:32:30 +0400 Subject: [PATCH 13/19] PHRAS-3084 --- resources/www/admin/styles/main.scss | 31 ++++- .../images/icons/check-square-regular.svg | 1 + .../common/images/icons/square-duotone.svg | 1 + .../common/images/icons/square-regular.svg | 1 + templates/web/admin/editusers.html.twig | 128 +++++++----------- templates/web/admin/index.html.twig | 2 + 6 files changed, 85 insertions(+), 79 deletions(-) create mode 100644 resources/www/common/images/icons/check-square-regular.svg create mode 100644 resources/www/common/images/icons/square-duotone.svg create mode 100644 resources/www/common/images/icons/square-regular.svg diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index cff7851f82..ecef9a195c 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -189,6 +189,31 @@ $mainMenuLinkBackgroundHoverColor: transparent; color: #ffffff; } +.select-all-line { + color: #afafaf; + cursor: pointer; +} +.users_check_line_wrap { + position: absolute; + div { + padding: 5px 10px; + background-color: #cccccc; + color: #000000; + cursor: pointer; + + &:hover { + padding: 5px 10px; + background-color: #4d4d4d; + color: #ffffff; + } + } +} + +.fa-right { + color: #2475b5; + font-size: 16px; +} + /******* EDIT USERS ***********************************************************/ div.no_switch { width: 12px; @@ -211,7 +236,7 @@ div.switch_quota.mixed, div.switch_masks.mixed, div.switch_time.mixed, div.switch_right.mixed { - background-image: url('#{$iconsPath}ccoch2.gif'); + background-image: url('#{$iconsPath}square-duotone.svg'); background-repeat: no-repeat; background-position: center center; } @@ -219,7 +244,7 @@ div.switch_quota.checked, div.switch_masks.checked, div.switch_time.checked, div.switch_right.checked { - background-image: url('#{$iconsPath}ccoch1.gif'); + background-image: url('#{$iconsPath}check-square-regular.svg'); background-repeat: no-repeat; background-position: center center; } @@ -227,7 +252,7 @@ div.switch_quota.unchecked, div.switch_masks.unchecked, div.switch_time.unchecked, div.switch_right.unchecked { - background-image: url('#{$iconsPath}ccoch0.gif'); + background-image: url('#{$iconsPath}square-regular.svg'); background-repeat: no-repeat; background-position: center center; } diff --git a/resources/www/common/images/icons/check-square-regular.svg b/resources/www/common/images/icons/check-square-regular.svg new file mode 100644 index 0000000000..c7699d239b --- /dev/null +++ b/resources/www/common/images/icons/check-square-regular.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/common/images/icons/square-duotone.svg b/resources/www/common/images/icons/square-duotone.svg new file mode 100644 index 0000000000..14a344c780 --- /dev/null +++ b/resources/www/common/images/icons/square-duotone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/common/images/icons/square-regular.svg b/resources/www/common/images/icons/square-regular.svg new file mode 100644 index 0000000000..4e73fc5fad --- /dev/null +++ b/resources/www/common/images/icons/square-regular.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index 39e9b5a3bf..3dbaa77612 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -61,24 +61,6 @@ div.no_switch{ background-image:url(/assets/common/images/icons/ccoch5.gif); } - div.switch_quota.mixed, - div.switch_masks.mixed, - div.switch_time.mixed, - div.switch_right.mixed{ - background-image:url(/assets/common/images/icons/ccoch2.gif); - } - div.switch_quota.checked, - div.switch_masks.checked, - div.switch_time.checked, - div.switch_right.checked{ - background-image:url(/assets/common/images/icons/ccoch1.gif); - } - div.switch_quota.unchecked, - div.switch_masks.unchecked, - div.switch_time.unchecked, - div.switch_right.unchecked{ - background-image:url(/assets/common/images/icons/ccoch0.gif); - } td.users_col{ vertical-align:middle; text-align:center; @@ -188,49 +170,49 @@
    {% endif %} - - - - - - - - - {% endfor %} @@ -1109,35 +1090,30 @@ } }); - $('.select-all-bdd-right').click(function () { - $('.main-right-item > div').removeClass('unchecked').addClass('checked'); - $('.main-right-item > div > input').val(1); + + $('body').click(function() { + $('.users_check_line_wrap').addClass('hide'); + }); + $('.select-all-line-btn').click(function (event) { + event.stopPropagation(); + var top = $(this).offset().top - 50; + var left = $(this).offset().left + 60; + $('.users_check_line_wrap').addClass('hide'); + $(this).closest('.select-all-line').find('.users_check_line_wrap').removeClass('hide').css('top', +top+'px'); + + }); + $('.check_left_right').click(function () { + $(this).closest('.right-items').find('.left-right div').show().removeClass('unchecked').addClass('checked'); + $(this).closest('.right-items').find('.left-right input').val(1); + $('.users_check_line_wrap').addClass('hide'); }); - $('.select-all-bdd').click(function () { + $('.check-all_right').click(function () { $(this).closest('.right-items').find('div').show().removeClass('unchecked').addClass('checked'); $(this).closest('.right-items').find('input').val(1); - $(this).closest('.right-items').find('.unselect-all-bdd').removeClass('hide'); - $(this).addClass('hide'); - }); - $('.unselect-all-bdd').click(function () { - $(this).closest('.right-items').find('div').hide().addClass('unchecked').remove('checked'); - $(this).closest('.right-items').find('.case_right_access div').show(); - $(this).closest('.right-items').find('input').val(0); - $(this).closest('.right-items').find('.select-all-bdd').removeClass('hide'); - $(this).addClass('hide'); + $('.users_check_line_wrap').addClass('hide'); }); - function countCheckedRight() { - $(".right-items" ).each(function() { - let count_checked = $( this ).find('input.checked').length; - if ( count_checked == 17) { - $(this).find('.select-all-bdd').addClass('hide'); - $(this).find('.unselect-all-bdd').removeClass('hide'); - } - }); - }; - countCheckedRight(); }); require([ diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index d0cbbbfc86..c9e1f3e195 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -42,6 +42,8 @@ serverDisconnected: '{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans | e('js') }}', check_all : '{{ 'Cocher toute la colonne' | trans | e('js') }}', uncheck_all : '{{ 'Decocher toute la colonne' | trans | e('js') }}', + check_left_right : '{{ 'admin::users:edit: check left right' | trans | e('js') }}', + check_all_right : '{{ 'admin::users:edit: check all right' | trans | e('js') }}', create_template : '{{ 'Creer un model' | trans | e('js') }}', create_user : '{{ 'Creer un utilisateur' | trans | e('js') }}', annuler : '{{ 'boutton::annuler' | trans | e('js') }}', From b133b08b251db032d59063fce822b2df20def475 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 25 May 2020 16:47:36 +0400 Subject: [PATCH 14/19] PHRAS-3084 Add string translation --- resources/locales/messages.de.xlf | 169 ++++++++++-------- resources/locales/messages.en.xlf | 169 ++++++++++-------- resources/locales/messages.fr.xlf | 169 ++++++++++-------- resources/locales/messages.nl.xlf | 169 ++++++++++-------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../www/admin/images/database-solid-blue.svg | 1 + resources/www/admin/images/database-solid.svg | 1 + resources/www/admin/styles/main.scss | 4 + templates/web/admin/tree.html.twig | 4 +- 12 files changed, 392 insertions(+), 302 deletions(-) create mode 100644 resources/www/admin/images/database-solid-blue.svg create mode 100644 resources/www/admin/images/database-solid.svg diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 24e2725f3b..5d6a241164 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. @@ -546,7 +546,7 @@ Access Zugriff actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -566,17 +566,17 @@ Access to HD Zugriff auf HD Download - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Zugriff auf Bild Werkzeug wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Zugriff auf Vorschaubild - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -644,7 +644,7 @@ Active Aktiv - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -751,7 +751,7 @@ Adresse email du nouvel utilisateur Email Adresse des neuen Benutzers - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -846,7 +846,7 @@ Ajouter un nouvel utilisateur einen neuen Benutzer hinzufügen - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -895,47 +895,47 @@ Allowed to access report Zugriff auf Report wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Hinzufügen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Erlaubt, Dokumente in Sammelkörbe hinzuzufügen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Status Veränderungen werden erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Löschen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Verarbeitung wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Ordnen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Veröffentlichen wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Push wird erlaubt - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1133,7 +1133,7 @@ Apply a template Eine Schablone anwenden web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1149,7 +1149,7 @@ Apply template Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1186,13 +1186,13 @@ Are you sure you want to reset rights? Sind Sie sicher, die Rechte zurückzusetzen? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention Vorsicht Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig Attention ! @@ -1923,7 +1923,7 @@ Confirm reset users rights before applying template Zurücksetzung von Benutzerrechten bestätigen, bevor Sie die Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -2092,17 +2092,17 @@ Creer un model eine Vorlage erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele eine Vorlage erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur einen Benutzer erstellen - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -2387,7 +2387,7 @@ Delete all users rights Alle Nutzerrechte löschen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2719,12 +2719,12 @@ Edition des droits de %display_name% Bearbeitung von %display_name% Rechten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Bearbeitung von %number% Benutzer Rechten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -3773,7 +3773,7 @@ Infos Informationen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Inscription @@ -4245,32 +4245,32 @@ Manage DB fields Datenbank Felder verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Datenbank verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Thesaurus verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Kollektion verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Benutzer verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Wertelisten verwalten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -4653,7 +4653,7 @@ Nom du nouveau modele Name der neue Vorlage - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -5623,13 +5623,13 @@ Reglages:: reglages d acces guest Gast Zugriff Einstellungen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Auto Register Einstellungen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5665,7 +5665,7 @@ Remove watermark Wasserzeichen entfernen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -5724,7 +5724,7 @@ Require email validation to activate the account Email Validierung erfordern, um Konto zu aktivieren - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5744,12 +5744,12 @@ Reset and apply Zurücksetzen und Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Zurücksetzen und Vorlage anwenden - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5759,7 +5759,7 @@ Reset rights before applying template? Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5841,12 +5841,12 @@ Rights Rechte - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rights will be erased before applying template, do you confirm? Benutzerrechte werden gelöscht, bevor Sie die Vorlage anwenden. Bestätigen? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -6070,7 +6070,7 @@ Send an email to the user to setup his password Eine Email zum Benutzer senden, um sein Passwort festzulegen - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6123,7 +6123,7 @@ Set download quotas Download Quoten festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6134,12 +6134,12 @@ Set statuses restrictions Status Beschränkungen festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Zeitliche Beschränkungen festlegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -6436,7 +6436,7 @@ Successful install Erfolgreiche Installation - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6811,7 +6811,7 @@ This field is required Dieses Feld ist erforderlich - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6822,7 +6822,7 @@ This file is too big Datei ist zu gross Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -7681,8 +7681,8 @@ Would you like to reset rights before applying the template? Möchten Sie die Benutzerrechte zurücksetzen, bevor Sie die Vorlage anwenden? - web/admin/index.html.twig - web/admin/index.html.twig + web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8507,7 +8507,7 @@ Controller/Admin/UserController.php web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur adresse @@ -8517,7 +8517,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur changer mon mot de passe @@ -8531,7 +8531,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur confirmer la nouvelle adresse email @@ -8558,7 +8558,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur fax @@ -8567,7 +8567,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur id utilisateur @@ -8585,7 +8585,7 @@ web/account/reset-email.html.twig web/admin/users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur mot de passe @@ -8606,7 +8606,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur nouvelle adresse email @@ -8627,7 +8627,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur prenom @@ -8638,14 +8638,14 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur sexe Anrede Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur societe @@ -8657,7 +8657,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur tel @@ -8672,7 +8672,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer @@ -8686,7 +8686,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur: L'email a correctement ete mis a jour @@ -8782,7 +8782,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: mademoiselle @@ -8790,7 +8790,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: monsieur @@ -8798,7 +8798,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::monitor: bases sur lesquelles l'utilisateur est connecte : @@ -9071,6 +9071,27 @@ Gastbenutzer filtern web/admin/users.html.twig + + admin::users:edit: Manage inline selection + admin::users:edit: Manage inline selection + web/admin/editusers.html.twig + + + admin::users:edit: check all right + admin::users:edit: check all right + web/admin/index.html.twig + web/admin/editusers.html.twig + + + admin::users:edit: check left right + admin::users:edit: check left right + web/admin/index.html.twig + + + admin::users:edit: check read right + admin::users:edit: check read right + web/admin/editusers.html.twig + admin::utilisateurs: bases de donnees Datenbanken @@ -9489,7 +9510,7 @@ web/report/all_content.html.twig admin/collection/create.html.twig admin/publications/fiche.html.twig - web/admin/index.html.twig + web/admin/index.html.twig boutton::appliquer @@ -9508,7 +9529,7 @@ boutton::choisir Auswählen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -9661,7 +9682,7 @@ admin/databox/details.html.twig admin/publications/fiche.html.twig user/import/file.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::retry @@ -9781,7 +9802,7 @@ admin/publications/fiche.html.twig admin/user/registrations.html.twig user/import/view.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::vue graphique diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 453895ca4f..cbae45f23f 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.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. @@ -546,7 +546,7 @@ Access Access actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -566,17 +566,17 @@ Access to HD Access to Documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Access to media tools - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Access subviews - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -644,7 +644,7 @@ Active Active - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -752,7 +752,7 @@ Adresse email du nouvel utilisateur New user e-mail address - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -847,7 +847,7 @@ Ajouter un nouvel utilisateur Add a new user - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -896,47 +896,47 @@ Allowed to access report Allow to access Report - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Allow to add - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Allow to add document to basket - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Allow to change status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Allow to delete - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Allow to edit - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Allow to order - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Allow to publish - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Allow to push - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1134,7 +1134,7 @@ Apply a template Apply a template web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1150,7 +1150,7 @@ Apply template Apply template - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1187,13 +1187,13 @@ Are you sure you want to reset rights? Are you sure you want to reset the user rights? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention Warning Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig Attention ! @@ -1925,7 +1925,7 @@ Confirm reset users rights before applying template Confirm the reset of selected users' rights before applying the template - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -2094,17 +2094,17 @@ Creer un model Create a template user - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Create a template - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Create a new user - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -2390,7 +2390,7 @@ Delete all users rights Delete all users rights web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2722,12 +2722,12 @@ Edition des droits de %display_name% %display_name% user right edition - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs User rights edition of %number% users - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -3776,7 +3776,7 @@ Infos Info - web/admin/editusers.html.twig + web/admin/editusers.html.twig Inscription @@ -4248,32 +4248,32 @@ Manage DB fields Manage documentary fields of database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Manage database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Manage thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Manage collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Manage users - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Manage values lists - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -4656,7 +4656,7 @@ Nom du nouveau modele New template name - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -5626,13 +5626,13 @@ Reglages:: reglages d acces guest Guest access setup web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Auto register setup web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5668,7 +5668,7 @@ Remove watermark Remove watermark - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -5727,7 +5727,7 @@ Require email validation to activate the account Require e-mail validation to activate the account. - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5747,12 +5747,12 @@ Reset and apply Reset and apply - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Reset and apply template - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5762,7 +5762,7 @@ Reset rights before applying template? Reset rights before applying template? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5844,12 +5844,12 @@ Rights Rights - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rights will be erased before applying template, do you confirm? Rights will be erased before applying template, do you confirm? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -6073,7 +6073,7 @@ Send an email to the user to setup his password Send user an e-mail for password setup. - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6126,7 +6126,7 @@ Set download quotas Set downloads quotas - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6137,12 +6137,12 @@ Set statuses restrictions Set status restrictions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Set time restriction - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -6439,7 +6439,7 @@ Successful install Successful installation - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6814,7 +6814,7 @@ This field is required This field is required - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6825,7 +6825,7 @@ This file is too big This file is too big Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -7684,8 +7684,8 @@ Would you like to reset rights before applying the template? Reset rights before applying the template? - web/admin/index.html.twig - web/admin/index.html.twig + web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8510,7 +8510,7 @@ Controller/Admin/UserController.php web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur adresse @@ -8520,7 +8520,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur changer mon mot de passe @@ -8534,7 +8534,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur confirmer la nouvelle adresse email @@ -8561,7 +8561,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur fax @@ -8570,7 +8570,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur id utilisateur @@ -8588,7 +8588,7 @@ web/account/reset-email.html.twig web/admin/users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur mot de passe @@ -8609,7 +8609,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur nouvelle adresse email @@ -8630,7 +8630,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur prenom @@ -8641,14 +8641,14 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur sexe Gender Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur societe @@ -8660,7 +8660,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur tel @@ -8675,7 +8675,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer @@ -8689,7 +8689,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur: L'email a correctement ete mis a jour @@ -8785,7 +8785,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: mademoiselle @@ -8793,7 +8793,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: monsieur @@ -8801,7 +8801,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::monitor: bases sur lesquelles l'utilisateur est connecte : @@ -9074,6 +9074,27 @@ Show guest user web/admin/users.html.twig + + admin::users:edit: Manage inline selection + admin::users:edit: Manage inline selection + web/admin/editusers.html.twig + + + admin::users:edit: check all right + admin::users:edit: check all right + web/admin/index.html.twig + web/admin/editusers.html.twig + + + admin::users:edit: check left right + admin::users:edit: check left right + web/admin/index.html.twig + + + admin::users:edit: check read right + admin::users:edit: check read right + web/admin/editusers.html.twig + admin::utilisateurs: bases de donnees Databases @@ -9492,7 +9513,7 @@ web/report/all_content.html.twig admin/collection/create.html.twig admin/publications/fiche.html.twig - web/admin/index.html.twig + web/admin/index.html.twig boutton::appliquer @@ -9511,7 +9532,7 @@ boutton::choisir Choose web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -9664,7 +9685,7 @@ admin/databox/details.html.twig admin/publications/fiche.html.twig user/import/file.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::retry @@ -9784,7 +9805,7 @@ admin/publications/fiche.html.twig admin/user/registrations.html.twig user/import/view.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::vue graphique diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 035de9353e..1727daa5a2 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.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. @@ -546,7 +546,7 @@ Access Accès actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -566,17 +566,17 @@ Access to HD Autoriser à télécharger les Documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Autoriser à accéder aux outils images - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Accès aux sous résolutions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -644,7 +644,7 @@ Active Actif - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -751,7 +751,7 @@ Adresse email du nouvel utilisateur Adresse e-mail du nouvel utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -846,7 +846,7 @@ Ajouter un nouvel utilisateur Ajouter un nouvel utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -895,47 +895,47 @@ Allowed to access report Autoriser à consulter Phraseanet Report - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Autoriser à ajouter des documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Autoriser à créer des paniers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Autoriser à changer les status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Autoriser à supprimer des documents - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Autoriser à éditer les notices - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Autoriser à commander - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Autoriser à publier - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Autoriser à faire des diffusions - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1133,7 +1133,7 @@ Apply a template Appliquer un modèle web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1149,7 +1149,7 @@ Apply template Appliquer le modèle - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1186,13 +1186,13 @@ Are you sure you want to reset rights? Etes-vous sûr de vouloir réinitialiser les droits ? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention Attention Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig Attention ! @@ -1923,7 +1923,7 @@ Confirm reset users rights before applying template Confirmez la réinitialisation des droits utilisateur avant d'appliquer le modèle. - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -2092,17 +2092,17 @@ Creer un model Créer un modèle - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Créer un modèle - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Créer un utilisateur - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -2387,7 +2387,7 @@ Delete all users rights Supprimer tous les droits de l'utilisateur web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2719,12 +2719,12 @@ Edition des droits de %display_name% Edition des droits de %display_name% - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Edition des droits de %number% utilisateurs - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -3773,7 +3773,7 @@ Infos Informations - web/admin/editusers.html.twig + web/admin/editusers.html.twig Inscription @@ -4245,32 +4245,32 @@ Manage DB fields Gérer les champs documentaires - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Gérer la Base de Données - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Gérer le thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Autoriser à gérer les paramètres de collection - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Autoriser à gérer les utilisateurs - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Gérer les valeurs suggérées - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -4653,7 +4653,7 @@ Nom du nouveau modele Nom du nouveau modèle - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -5625,13 +5625,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reglages:: reglages d acces guest Réglages d'accès invité web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee Réglages d'auto-inscription web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5667,7 +5667,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Remove watermark Sans filigrane - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -5726,7 +5726,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Require email validation to activate the account Demander une confirmation par e-mail pour valider le compte - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5746,12 +5746,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reset and apply Réinitialiser et appliquer - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Réinitialiser et appliquer le modèle - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5761,7 +5761,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reset rights before applying template? Réinitialiser les droits avant d'appliquer modèle ? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5843,12 +5843,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Rights Droits - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rights will be erased before applying template, do you confirm? Les droits seront effacés avant d'appliquer le modèle. Confirmez-vous l'action ? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -6072,7 +6072,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Send an email to the user to setup his password Envoyer un e-mail à l'utilisateur pour créer son mot de passe - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6125,7 +6125,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Set download quotas Régler les quotas de téléchargement - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6136,12 +6136,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Set statuses restrictions Régler les droits d'accès selon les status - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Régler les restrictions temporelles - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -6438,7 +6438,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Successful install Installation réussie - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6813,7 +6813,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This field is required Ce champ est obligatoire - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6824,7 +6824,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis This file is too big Ce fichier est trop volumineux Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -7683,8 +7683,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Would you like to reset rights before applying the template? Souhaitez-vous réinitialiser les droits avant d'appliquer le modèle ? - web/admin/index.html.twig - web/admin/index.html.twig + web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8509,7 +8509,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur adresse @@ -8519,7 +8519,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur changer mon mot de passe @@ -8533,7 +8533,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur confirmer la nouvelle adresse email @@ -8560,7 +8560,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur fax @@ -8569,7 +8569,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur id utilisateur @@ -8587,7 +8587,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/account/reset-email.html.twig web/admin/users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur mot de passe @@ -8608,7 +8608,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur nouvelle adresse email @@ -8629,7 +8629,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur prenom @@ -8640,14 +8640,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur sexe Civilité Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur societe @@ -8659,7 +8659,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur tel @@ -8674,7 +8674,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer @@ -8688,7 +8688,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur: L'email a correctement ete mis a jour @@ -8785,7 +8785,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: mademoiselle @@ -8793,7 +8793,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: monsieur @@ -8801,7 +8801,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::monitor: bases sur lesquelles l'utilisateur est connecte : @@ -9074,6 +9074,27 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Filtrer les utilisateurs invités web/admin/users.html.twig + + admin::users:edit: Manage inline selection + admin::users:edit: Manage inline selection + web/admin/editusers.html.twig + + + admin::users:edit: check all right + admin::users:edit: check all right + web/admin/index.html.twig + web/admin/editusers.html.twig + + + admin::users:edit: check left right + admin::users:edit: check left right + web/admin/index.html.twig + + + admin::users:edit: check read right + admin::users:edit: check read right + web/admin/editusers.html.twig + admin::utilisateurs: bases de donnees Bases @@ -9492,7 +9513,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/report/all_content.html.twig admin/collection/create.html.twig admin/publications/fiche.html.twig - web/admin/index.html.twig + web/admin/index.html.twig boutton::appliquer @@ -9511,7 +9532,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::choisir Choisir web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -9664,7 +9685,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/databox/details.html.twig admin/publications/fiche.html.twig user/import/file.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::retry @@ -9784,7 +9805,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/publications/fiche.html.twig admin/user/registrations.html.twig user/import/view.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::vue graphique diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 8caa101439..e7a8818eea 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. @@ -550,7 +550,7 @@ Access Toegang actions/Feedback/List-Share.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access code @@ -570,17 +570,17 @@ Access to HD Toegang tot HD - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to image tools Toegang tot beeldgereedschappen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to preview Toegang tot voorvertoning - web/admin/editusers.html.twig + web/admin/editusers.html.twig Access to the above bases constitutes acceptance of the following Terms of Use (TOU). @@ -648,7 +648,7 @@ Active Actief - web/admin/editusers.html.twig + web/admin/editusers.html.twig Activer @@ -756,7 +756,7 @@ Adresse email du nouvel utilisateur Email adres van de nieuwe gebruiker - web/admin/index.html.twig + web/admin/index.html.twig Advanced Search @@ -851,7 +851,7 @@ Ajouter un nouvel utilisateur Voeg een nieuwe gebruiker toe - web/admin/index.html.twig + web/admin/index.html.twig Ajouter un publisher @@ -900,47 +900,47 @@ Allowed to access report Toegestaan ​​om rapport te openen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add Toegestaan om toe te voegen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to add in basket Toegestaan om in mandje te plaatsen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to change statuses Toegestaan om statussen te veranderen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to delete Toegestaan om te verwijderen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to edit Toegestaan om te bewerken - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to order Toegestaan om te sorteren - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to publish Publiceren toegelaten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Allowed to push Toegestaan om door te sturen - web/admin/editusers.html.twig + web/admin/editusers.html.twig Alphabetic asc @@ -1138,7 +1138,7 @@ Apply a template Pas een sjabloon toe web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Apply changes @@ -1154,7 +1154,7 @@ Apply template Pas de template toe - web/admin/index.html.twig + web/admin/index.html.twig Apply to all selected documents @@ -1191,13 +1191,13 @@ Are you sure you want to reset rights? Bent u zeker om de rechten te herstellen? - web/admin/editusers.html.twig + web/admin/editusers.html.twig Attention Let op! Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig Attention ! @@ -1929,7 +1929,7 @@ Confirm reset users rights before applying template Bevestig reset van de gebruikersrechten alvorens de template toe te passen - web/admin/index.html.twig + web/admin/index.html.twig Confirmation de votre mot de passe @@ -2098,17 +2098,17 @@ Creer un model Maak een model - web/admin/index.html.twig + web/admin/index.html.twig Creer un modele Maak een model - web/admin/index.html.twig + web/admin/index.html.twig Creer un utilisateur Maak een gebruiker - web/admin/index.html.twig + web/admin/index.html.twig Creer une nouvelle applications @@ -2394,7 +2394,7 @@ Delete all users rights Verwijder alle gebruikersrechten web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Delete basket @@ -2726,12 +2726,12 @@ Edition des droits de %display_name% Rechten aanpassingen voor %display_name% - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition des droits de %number% utilisateurs Rechten aanpassingen voor %number% gebruikers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Edition impossible @@ -3783,7 +3783,7 @@ Infos Informaties - web/admin/editusers.html.twig + web/admin/editusers.html.twig Inscription @@ -4255,32 +4255,32 @@ Manage DB fields Begeer DB velden - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Database Beheer Database - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage Thesaurus Beheer Thesaurus - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage collection Beheer collectie - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage users Beheer gebruikers - web/admin/editusers.html.twig + web/admin/editusers.html.twig Manage values lists Beheer waarden lijsten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Mandatory @@ -4663,7 +4663,7 @@ Nom du nouveau modele Naam van het nieuwe model - web/admin/index.html.twig + web/admin/index.html.twig Nom du nouveau panier @@ -5633,13 +5633,13 @@ Reglages:: reglages d acces guest instellingen voor gasttoegang web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Reglages:: reglages d inscitpition automatisee instellingen voor automatisch inschrijven web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig Relevance @@ -5675,7 +5675,7 @@ Remove watermark Verwijder watermerk - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rename @@ -5734,7 +5734,7 @@ Require email validation to activate the account Email validatie verwacht om de gebruiker te activeren - web/admin/index.html.twig + web/admin/index.html.twig Required @@ -5754,12 +5754,12 @@ Reset and apply Reset en pas toe - web/admin/index.html.twig + web/admin/index.html.twig Reset and apply template Reset en pas de template toe - web/admin/index.html.twig + web/admin/index.html.twig Reset cache @@ -5769,7 +5769,7 @@ Reset rights before applying template? De rechten resetten alvorens de template toe te passen? - web/admin/index.html.twig + web/admin/index.html.twig Resolution @@ -5851,12 +5851,12 @@ Rights Rechten - web/admin/editusers.html.twig + web/admin/editusers.html.twig Rights will be erased before applying template, do you confirm? Rechten worden gewist voor het toe passen van de template, bent u zeker? - web/admin/index.html.twig + web/admin/index.html.twig Role @@ -6080,7 +6080,7 @@ Send an email to the user to setup his password Stuur een email naar de gebruiker om zijn wachtwoord in te stellen - web/admin/index.html.twig + web/admin/index.html.twig Send to Facebook @@ -6133,7 +6133,7 @@ Set download quotas Stel downloaden quota in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set labels @@ -6144,12 +6144,12 @@ Set statuses restrictions Stel statusbeperkingen in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Set time restrictions Stel tijdsbeperkingen in - web/admin/editusers.html.twig + web/admin/editusers.html.twig Setup @@ -6446,7 +6446,7 @@ Successful install Installatie geslaagd - web/admin/index.html.twig + web/admin/index.html.twig Successful removal @@ -6821,7 +6821,7 @@ This field is required Dit veld is verplicht - web/admin/index.html.twig + web/admin/index.html.twig This field represents the title of the document @@ -6832,7 +6832,7 @@ This file is too big Deze file is te groot Controller/Prod/LanguageController.php - web/admin/index.html.twig + web/admin/index.html.twig This is a template @@ -7691,8 +7691,8 @@ Would you like to reset rights before applying the template? Wilt u de rechten resetten alvorens de template toe te passen? - web/admin/index.html.twig - web/admin/index.html.twig + web/admin/index.html.twig + web/admin/index.html.twig Write Metas @@ -8517,7 +8517,7 @@ Controller/Admin/UserController.php web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur adresse @@ -8527,7 +8527,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur changer mon mot de passe @@ -8541,7 +8541,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur confirmer la nouvelle adresse email @@ -8568,7 +8568,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur fax @@ -8577,7 +8577,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur id utilisateur @@ -8595,7 +8595,7 @@ web/account/reset-email.html.twig web/admin/users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur mot de passe @@ -8616,7 +8616,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur nouvelle adresse email @@ -8637,7 +8637,7 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur prenom @@ -8648,14 +8648,14 @@ web/common/dialog_export.html.twig web/account/account.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur sexe Geslacht Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur societe @@ -8667,7 +8667,7 @@ web/admin/users.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur tel @@ -8682,7 +8682,7 @@ web/account/account.html.twig web/admin/connected-users.html.twig admin/user/registrations.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur un email de confirmation vient de vous etre envoye. Veuillez suivre les instructions contenue pour continuer @@ -8696,7 +8696,7 @@ Controller/Admin/UserController.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur: L'email a correctement ete mis a jour @@ -8792,7 +8792,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: mademoiselle @@ -8800,7 +8800,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::compte-utilisateur:sexe: monsieur @@ -8808,7 +8808,7 @@ Core/Provider/RegistrationServiceProvider.php web/common/dialog_export.html.twig web/account/account.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig admin::monitor: bases sur lesquelles l'utilisateur est connecte : @@ -9081,6 +9081,27 @@ admin::userlist: filterguestuser web/admin/users.html.twig + + admin::users:edit: Manage inline selection + admin::users:edit: Manage inline selection + web/admin/editusers.html.twig + + + admin::users:edit: check all right + admin::users:edit: check all right + web/admin/index.html.twig + web/admin/editusers.html.twig + + + admin::users:edit: check left right + admin::users:edit: check left right + web/admin/index.html.twig + + + admin::users:edit: check read right + admin::users:edit: check read right + web/admin/editusers.html.twig + admin::utilisateurs: bases de donnees datables @@ -9499,7 +9520,7 @@ web/report/all_content.html.twig admin/collection/create.html.twig admin/publications/fiche.html.twig - web/admin/index.html.twig + web/admin/index.html.twig boutton::appliquer @@ -9518,7 +9539,7 @@ boutton::choisir kiezen web/admin/users.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::commander @@ -9671,7 +9692,7 @@ admin/databox/details.html.twig admin/publications/fiche.html.twig user/import/file.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::retry @@ -9791,7 +9812,7 @@ admin/publications/fiche.html.twig admin/user/registrations.html.twig user/import/view.html.twig - web/admin/editusers.html.twig + web/admin/editusers.html.twig boutton::vue graphique diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 3e4e68cbe2..be44d763fd 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 0d2a95fe7d..0564cc1926 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 3bb8bb493d..d25e5d56f5 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 9641678a20..4846f6f897 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/resources/www/admin/images/database-solid-blue.svg b/resources/www/admin/images/database-solid-blue.svg new file mode 100644 index 0000000000..f915d2e0a3 --- /dev/null +++ b/resources/www/admin/images/database-solid-blue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/images/database-solid.svg b/resources/www/admin/images/database-solid.svg new file mode 100644 index 0000000000..4b87f7fac5 --- /dev/null +++ b/resources/www/admin/images/database-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index ebf64df0a8..7d7c3fbc12 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -200,6 +200,7 @@ $mainMenuLinkBackgroundHoverColor: transparent; background-color: #cccccc; color: #000000; cursor: pointer; + line-height: 1.7; &:hover { padding: 5px 10px; @@ -212,6 +213,9 @@ $mainMenuLinkBackgroundHoverColor: transparent; .fa-right { color: #2475b5; font-size: 16px; + .select-all-line-btn & { + padding-left: 6px; + } } /******* EDIT USERS ***********************************************************/ diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index 3d6416deaa..ca9991b2a9 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -89,7 +89,7 @@
  • - + {{ 'admin::utilisateurs: bases de donnees' | trans }}
    @@ -114,7 +114,7 @@
  • - + {{ databox.get_label(app['locale']) }}
    From ee1961cd93cec62e9e9d53e821880856da4d588d Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 25 May 2020 18:53:13 +0400 Subject: [PATCH 15/19] PHRAS-3084 Fix on users edit right --- .../common/images/icons/square-duotone.svg | 2 +- templates/web/admin/editusers.html.twig | 61 +++++++------------ 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/resources/www/common/images/icons/square-duotone.svg b/resources/www/common/images/icons/square-duotone.svg index 14a344c780..7333e8b0f2 100644 --- a/resources/www/common/images/icons/square-duotone.svg +++ b/resources/www/common/images/icons/square-duotone.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index 3dbaa77612..e83482ed26 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -119,40 +119,20 @@
    • databox_idrecord_idworkwork_oncreatedpublishedstatus{{ 'admin::workermanager:tab:workerinfo: databox_id' | trans }}{{ 'admin::workermanager:tab:workerinfo: record_id' | trans }}{{ 'admin::workermanager:tab:workerinfo: work' | trans }}{{ 'admin::workermanager:tab:workerinfo: work_on' | trans }}{{ 'admin::workermanager:tab:workerinfo: created' | trans }}{{ 'admin::workermanager:tab:workerinfo: published' | trans }}{{ 'admin::workermanager:tab:workerinfo: status' | trans }}
    + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_CHUPUB'), users, 'sbas')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_MODIF_TH'), users, 'sbas')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_MANAGE'), users, 'sbas')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_MODIFY_STRUCT'), users, 'sbas')}} + + {{ 'admin::users:edit:select all having rights' | trans }} + +
    {{rights['base_id']|bas_labels(app)}} - + + {{ 'admin::users:edit:select all ' | trans }} + + + {{ 'admin::users:edit:unselect all ' | trans }} +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    @@ -252,70 +234,70 @@
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    - ▼ +
    @@ -333,35 +315,32 @@ {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_MODIFY_STRUCT'), users, 'sbas')}}     		- - {{ 'admin::users:edit:select all having rights' | trans }} -
    + {{rights['base_id']|bas_labels(app)}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::ACCESS'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::ACTIF'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANPUTINALBUM'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANDWNLDPREVIEW'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::NOWATERMARK'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANDWNLDHD'), users, 'base')}} + {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANCMD'), users, 'base')}} @@ -427,13 +406,15 @@ {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::COLL_MODIFY_STRUCT'), users, 'base')}} - - {{ 'admin::users:edit:select all ' | trans }} - - - {{ 'admin::users:edit:unselect all ' | trans }} - + + +
    + +
    +
    +
    {{'admin::users:edit: check read right' | trans }}
    +
    {{'admin::users:edit: check all right' | trans }}
    +
    - +
    - - - - - - - -
    + - + +
    - - - -
    -
    - - +
    +
    {% set sbas = '' %} {% for rights in datas %} @@ -165,9 +145,10 @@ {% endif %} - + - {% endif %} - - + + @@ -374,7 +364,7 @@ - + - {% endfor %} From 756528d18f7fd1a284f8a7b25f6f3feff82aadd1 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 26 May 2020 14:13:23 +0400 Subject: [PATCH 16/19] PHRAS-2685 --- resources/www/admin/styles/main.scss | 9 +++++++++ templates/web/admin/users.html.twig | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 7d7c3fbc12..485c73a9dd 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -218,6 +218,15 @@ $mainMenuLinkBackgroundHoverColor: transparent; } } +.without-border { + margin-left: 15px; + border: none; + outline: none; + &:focus { + outline: none; + } +} + /******* EDIT USERS ***********************************************************/ div.no_switch { width: 12px; diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig index fe94644c8b..31e9f58041 100644 --- a/templates/web/admin/users.html.twig +++ b/templates/web/admin/users.html.twig @@ -46,7 +46,10 @@ - {{ 'Push::filter starts' | trans }} + {{ 'Last applied template' | trans }}
    + {{rights['sbas_id']|sbas_labels(app)}}
    @@ -229,7 +210,7 @@
    		+ @@ -318,10 +299,19 @@
    +
    {{rights['base_id']|bas_labels(app)}} +
    + +
    +
    +
    {{'admin::users:edit: check read right' | trans }}
    +
    {{'admin::users:edit: check all right' | trans }}
    +
    +     		{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::ACCESS'), users, 'base')}} {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANADDRECORD'), users, 'base')}} @@ -407,14 +397,7 @@ {{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::COLL_MODIFY_STRUCT'), users, 'base')}} -
    - -
    -
    -
    {{'admin::users:edit: check read right' | trans }}
    -
    {{'admin::users:edit: check all right' | trans }}
    -
    +