From 12849e1beb7aca8db8e7d1be6ae104b8a60687a0 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 27 Apr 2020 15:23:52 +0400
Subject: [PATCH 1/6] PHRAS-3041 #comment fix Admin tooltip_ui display #time 2h

---
 templates/web/admin/connected-users.html.twig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/web/admin/connected-users.html.twig b/templates/web/admin/connected-users.html.twig
index 4b784a385f..de890f7cf5 100644
--- a/templates/web/admin/connected-users.html.twig
+++ b/templates/web/admin/connected-users.html.twig
@@ -125,6 +125,9 @@
         $('.usrTips').uitooltip({
             content: function() {
                 return $( this ).attr( "title" );
+            },
+            classes: {
+                "ui-tooltip": "ui-tooltip ui-corner-all ui-widget ui-widget-content"
             }
         });
     }

From 5cf68aac9aa4e4a569f12a35ef6b385d5d1953d1 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 27 Apr 2020 15:53:28 +0400
Subject: [PATCH 2/6] PHRAS-3042

---
 templates/web/admin/editusers.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 2421976775..b80cb30b7f 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -159,7 +159,7 @@
             </tr>
           </tbody>
         </table>
-        <div class="" style="bottom:40px;top:127px;overflow-y:auto;overflow-x:hidden;width:850px;">
+        <div class="" style="bottom:40px;top:127px;overflow-y:auto;overflow-x:hidden;width:850px;max-height: 450px;">
           <table class="hoverable" cellspacing="0" cellpadding="0" border="0" style="table-layout: fixed;width:820px;">
       <!--      <thead>
               <tr>

From fe6c14b574a3e101c5485072d7300f28c6fd2979 Mon Sep 17 00:00:00 2001
From: aynsix <asr@esokia-webagency.com>
Date: Tue, 28 Apr 2020 12:25:45 +0300
Subject: [PATCH 3/6] fix basket sql request

---
 lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
index e01864e398..097282a2cb 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
@@ -206,15 +206,15 @@ class BasketRepository extends EntityRepository
 
     public function findContainingRecordForUser(\record_adapter $record, User $user)
     {
-        // todo : check "e.sbas_id = e.sbas_id" ???
         $dql = 'SELECT b
             FROM Phraseanet:Basket b
             JOIN b.elements e
-            WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
+            WHERE e.record_id = :record_id AND e.sbas_id = :databox_id
               AND b.user = :usr_id';
 
         $params = [
             'record_id' => $record->getRecordId(),
+            'databox_id'=> $record->getDataboxId(),
             'usr_id'    => $user->getId()
         ];
 

From 245773e82661bc92960e82029bd42dd9e3451b89 Mon Sep 17 00:00:00 2001
From: Nicolas Maillat <maillat@alchemy.fr>
Date: Tue, 28 Apr 2020 15:46:23 +0000
Subject: [PATCH 4/6] Translated using Weblate (French)

Currently translated at 99.8% (2476 of 2479 strings)
---
 resources/locales/messages.fr.xlf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index aec760eb73..48275bb8bc 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -4099,7 +4099,7 @@
       </trans-unit>
       <trans-unit id="3edfadcb908b635854afe7332087309fcd436f22" resname="Limite temporelle" approved="yes">
         <source>Limite temporelle</source>
-        <target state="translated">Liste temporelle</target>
+        <target state="translated">Limite temporelle</target>
         <jms:reference-file line="1">web/admin/editusers_timelimit_sbas.html.twig</jms:reference-file>
         <jms:reference-file line="1">web/admin/editusers_timelimit.html.twig</jms:reference-file>
       </trans-unit>

From 1add0f7fd678eacd63cfabee0867955ae942e2d6 Mon Sep 17 00:00:00 2001
From: Jennifer <jguerin@alchemy.fr>
Date: Tue, 28 Apr 2020 16:09:14 +0000
Subject: [PATCH 5/6] Translated using Weblate (French)

Currently translated at 99.8% (2476 of 2479 strings)
---
 resources/locales/messages.fr.xlf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 48275bb8bc..a3feed16f1 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1450,7 +1450,7 @@
       </trans-unit>
       <trans-unit id="020b418324a35a577ecc08e5f7dff1f58dcf7585" resname="Basket" approved="yes">
         <source>Basket</source>
-        <target state="translated">Basket</target>
+        <target state="translated">Panier</target>
         <jms:reference-file line="13">prod/WorkZone/Macros.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="d2d90e7ff1dfbf3b3fc83a0f5b30add947f86c96" resname="Basket created" approved="yes">

From 0fef22ee09758c59fd16300067037d66c6f4b8e1 Mon Sep 17 00:00:00 2001
From: Jennifer <jguerin@alchemy.fr>
Date: Tue, 28 Apr 2020 16:58:12 +0000
Subject: [PATCH 6/6] Translated using Weblate (German)

Currently translated at 99.7% (2474 of 2479 strings)
---
 resources/locales/messages.de.xlf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 7d07436788..45d16fb107 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -684,7 +684,7 @@
       </trans-unit>
       <trans-unit id="c4e29ed18c13ce03d9ae30560dfc80bf47c0c86c" resname="Add a list" approved="yes">
         <source>Add a list</source>
-        <target state="translated">Fügen Sie eine Liste hinzu</target>
+        <target state="translated">Neue Liste</target>
         <jms:reference-file line="8">actions/Feedback/lists-all.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="5bc397abf190599d339e7a0543f2ba2a6dbc8e38" resname="Add a new field" approved="yes">
@@ -9245,7 +9245,7 @@
       </trans-unit>
       <trans-unit id="136a12280c8d3c058d4e4a49375393bf64772a08" resname="boutton::creer" approved="yes">
         <source>boutton::creer</source>
-        <target state="translated">suchen</target>
+        <target state="translated">Erstellen</target>
         <jms:reference-file line="50">Controller/Prod/LanguageController.php</jms:reference-file>
         <jms:reference-file line="92">web/admin/databases.html.twig</jms:reference-file>
       </trans-unit>
@@ -11489,7 +11489,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
       </trans-unit>
       <trans-unit id="f2dbeebb5642463cc9d946ac5fef8b54e3ef9c8d" resname="prod::editing:remplace: chaine remplacante" approved="yes">
         <source>prod::editing:remplace: chaine remplacante</source>
-        <target state="translated">ersetzen durch</target>
+        <target state="translated">Ersetzen durch</target>
         <jms:reference-file line="304">prod/actions/edit_default.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="2d8fd9918eb060abef1aff6634ede1135c2f898a" resname="prod::editing:remplace: options de remplacement" approved="yes">
@@ -11715,7 +11715,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
       </trans-unit>
       <trans-unit id="e3f9c15df842b1cafaa7a08b3b2d3b1ff1173559" resname="prod:edit: only a media of type video can be edited" approved="yes">
         <source>prod:edit: only a media of type video can be edited</source>
-        <target state="translated">Nur eine Video kann bearbeitet sein</target>
+        <target state="translated">Nur eine Video kann bearbeitet werden</target>
         <jms:reference-file line="150">Controller/Prod/LanguageController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="d2e761bd6f1cd95c2ea787f5eb206f6457c20d4b" resname="prod:edit: suggested_values" approved="yes">
@@ -11745,7 +11745,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
       </trans-unit>
       <trans-unit id="6ce4044e1fce74fb5f716f7d67f3a538f4d12d26" resname="prod:push: create new user" approved="yes">
         <source>prod:push: create new user</source>
-        <target state="translated">Einen neuen Benutzer erstellen</target>
+        <target state="translated">Neuer Benutzer</target>
         <jms:reference-file line="157">Controller/Prod/LanguageController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a938566e7b60b6fc2e197259cf2f2b2f42656d17" resname="prod:push: delete selection" approved="yes">
@@ -11834,9 +11834,9 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben</target>
         <jms:reference-file line="245">Controller/Prod/FeedController.php</jms:reference-file>
         <jms:reference-file line="270">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
-      <trans-unit id="bf670e94fb7cc858d6c28745ea4fd8248eed01fb" resname="publications::copy">
+      <trans-unit id="bf670e94fb7cc858d6c28745ea4fd8248eed01fb" resname="publications::copy" approved="yes">
         <source>publications::copy</source>
-        <target state="new">publications::copy</target>
+        <target state="translated">URL kopieren</target>
         <jms:reference-file line="247">Controller/Prod/FeedController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="317aac7149d4bb63238dbe1f9461b3d817f1ff65" resname="publications::votre rss personnel" approved="yes">