Merge branch 'master' into PHRAS-4060-webhook-stay-in-running

alchemy-fr · Apr 29, 2024 · 2237d8d · 2237d8d
2 parents bac310d + da5a47f
commit 2237d8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/lib/Alchemy/Phrasea/Cache/RedisCache.php b/lib/Alchemy/Phrasea/Cache/RedisCache.php
@@ -142,14 +142,11 @@ public function deleteMulti(array $keys)
 
     public function removeByPattern($pattern)
     {
-        $keysToremove = [];
         $iterator = null;
         while(false !== ($keys = $this->_redis->scan($iterator, $pattern))) {
-            $keysToremove = array_merge($keysToremove, $keys);
+            $this->_redis->del($keys);
         }
 
-        $this->_redis->del($keysToremove);
-
         return true;
     }
 

diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
@@ -1462,9 +1462,9 @@
         <target state="translated">Zurück zur Sammelkörbe Liste</target>
         <jms:reference-file line="8">WorkZone/Browser/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color">
+      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color" xml:space="preserve">
         <source>Background Color</source>
-        <target state="translated">Hintergrundfarbe</target>
+        <target state="needs-translation">Hintergrundfarbe (z.B: #FFFFFF)</target>
         <jms:reference-file line="45">Media/Subdef/Image.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ae1378dc6a6f7df2435c398db9e6eac71646092b" resname="Bad request format, only JSON is allowed" approved="yes">
@@ -9862,7 +9862,7 @@
       </trans-unit>
       <trans-unit id="2564f949b4f742e02863e1fcc205df91774c51f9" resname="admin::workermanager:tab:workerinfo: change status to canceled" xml:space="preserve">
         <source>admin::workermanager:tab:workerinfo: change status to canceled</source>
-        <target state="needs-translation">Als "abbrechen" markieren</target>
+        <target state="needs-translation">Die gestartete Jobs als "Abbrechen" markieren, die seit...</target>
         <jms:reference-file line="7">admin/worker-manager/worker_info.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="224add9949a95aa2f40517f6f74ad86e4a76e376" resname="admin::workermanager:tab:workerinfo: created" approved="yes">

diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
@@ -1463,9 +1463,9 @@
         <target state="translated">Back to baskets list</target>
         <jms:reference-file line="8">WorkZone/Browser/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color">
+      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color" xml:space="preserve">
         <source>Background Color</source>
-        <target state="translated">Background color</target>
+        <target state="needs-translation">Background color (ex: #FFFFFF)</target>
         <jms:reference-file line="45">Media/Subdef/Image.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ae1378dc6a6f7df2435c398db9e6eac71646092b" resname="Bad request format, only JSON is allowed" approved="yes">
@@ -9864,7 +9864,7 @@
       </trans-unit>
       <trans-unit id="2564f949b4f742e02863e1fcc205df91774c51f9" resname="admin::workermanager:tab:workerinfo: change status to canceled" xml:space="preserve">
         <source>admin::workermanager:tab:workerinfo: change status to canceled</source>
-        <target state="needs-translation">Mark as "cancel"</target>
+        <target state="needs-translation">Mark as "Cancel" the jobs started since...</target>
         <jms:reference-file line="7">admin/worker-manager/worker_info.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="224add9949a95aa2f40517f6f74ad86e4a76e376" resname="admin::workermanager:tab:workerinfo: created" approved="yes">

diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
@@ -1462,9 +1462,9 @@
         <target state="translated">Retour à la liste des paniers</target>
         <jms:reference-file line="8">WorkZone/Browser/Basket.html.twig</jms:reference-file>
       </trans-unit>
-      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color">
+      <trans-unit id="874df4e774343ace22071f648b6b67d11e21b307" resname="Background Color" xml:space="preserve">
         <source>Background Color</source>
-        <target state="translated">Couleur de fond</target>
+        <target state="needs-translation">Couleur de fond (ex: #FFFFFF)</target>
         <jms:reference-file line="45">Media/Subdef/Image.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ae1378dc6a6f7df2435c398db9e6eac71646092b" resname="Bad request format, only JSON is allowed" approved="yes">
@@ -9863,7 +9863,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
       </trans-unit>
       <trans-unit id="2564f949b4f742e02863e1fcc205df91774c51f9" resname="admin::workermanager:tab:workerinfo: change status to canceled" xml:space="preserve">
         <source>admin::workermanager:tab:workerinfo: change status to canceled</source>
-        <target state="needs-translation">Marquer "Annuler"</target>
+        <target state="needs-translation">Marquer "Annuler" les travaux démarrés depuis...</target>
         <jms:reference-file line="7">admin/worker-manager/worker_info.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="224add9949a95aa2f40517f6f74ad86e4a76e376" resname="admin::workermanager:tab:workerinfo: created" approved="yes">