Merge branch 'master' into PHRAS-4095-Fix-for-phraseanet-saml-sp-imag…

…e-build-in-Dockerfile
alchemy-fr · Sep 6, 2024 · 32fd3e3 · 32fd3e3
2 parents b649839 + 53d1393
commit 32fd3e3
Show file tree

Hide file tree

Showing 12 changed files with 244 additions and 198 deletions.
diff --git a/docker-compose.datastores.yml b/docker-compose.datastores.yml
@@ -21,7 +21,7 @@ services:
       - internal
 
   rabbitmq:
-    image: rabbitmq:3.6.16-management
+    image: rabbitmq:3.8.34-management
     profiles: ["rabbitmq"]
     restart: on-failure
     hostname: $RABBITMQ_HOSTNAME
@@ -55,4 +55,4 @@ services:
     volumes:
     - ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data
     networks:
-      - internal
+      - internal
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2024-06-07T04:00:05Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2024-07-18T14:58:32Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -941,6 +941,11 @@
         <target state="translated">Toegestaan</target>
         <jms:reference-file line="37">web/account/authorized_apps.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="4d417e1abf31cc77ce9ad9af1f2d04530fb1539f" resname="Allowed caracteres are only A-Z, a-z, 0-9 and hyphens eg: Preview-mobile-01">
+        <source>Allowed caracteres are only A-Z, a-z, 0-9 and hyphens eg: Preview-mobile-01</source>
+        <target state="new">Allowed caracteres are only A-Z, a-z, 0-9 and hyphens eg: Preview-mobile-01</target>
+        <jms:reference-file line="260">web/admin/subdefs.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="c264a7efdbe0e0af2a6fe69e2bc9a89b90c5ec0e" resname="Allowed to access report" approved="yes">
         <source>Allowed to access report</source>
         <target state="translated">Toegestaan om rapport te openen</target>
@@ -1084,8 +1089,8 @@
         <target state="translated">Er is een fout opgetreden</target>
         <jms:reference-file line="81">Order/Controller/ProdOrderController.php</jms:reference-file>
         <jms:reference-file line="298">Controller/Prod/BasketController.php</jms:reference-file>
-        <jms:reference-file line="2094">Controller/Api/V1Controller.php</jms:reference-file>
-        <jms:reference-file line="2548">Controller/Api/V1Controller.php</jms:reference-file>
+        <jms:reference-file line="2091">Controller/Api/V1Controller.php</jms:reference-file>
+        <jms:reference-file line="2545">Controller/Api/V1Controller.php</jms:reference-file>
         <jms:reference-file line="136">Controller/Admin/SearchEngineController.php</jms:reference-file>
         <jms:reference-file line="544">Controller/Admin/DataboxController.php</jms:reference-file>
         <jms:reference-file line="127">Controller/Admin/CollectionController.php</jms:reference-file>
@@ -1472,8 +1477,8 @@
         <source>Bad request format, only JSON is allowed</source>
         <target state="translated">Slecht verzoek formaat, enkel JSON is toegestaan</target>
         <jms:reference-file line="190">Controller/Root/AccountController.php</jms:reference-file>
-        <jms:reference-file line="70">Controller/Admin/RootController.php</jms:reference-file>
-        <jms:reference-file line="232">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="71">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="233">Controller/Admin/RootController.php</jms:reference-file>
         <jms:reference-file line="598">Controller/Admin/DataboxController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="fa0d7d2cb29f1ca72b4108bfaa0bf5686d3910ff" resname="Bad request, please contact an admin" approved="yes">
@@ -2087,6 +2092,11 @@
         <target state="new">Create index</target>
         <jms:reference-file line="67">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
       </trans-unit>
+      <trans-unit id="384422e656d8a4d803155efc371754913755a4b0" resname="Create new subdef">
+        <source>Create new subdef</source>
+        <target state="new">Create new subdef</target>
+        <jms:reference-file line="362">web/admin/subdefs.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="c175379b0389b2d6057b0b7db996720f1fb92fc7" resname="Creation date" approved="yes">
         <source>Creation date</source>
         <target state="translated">Aanmaakdatum</target>
@@ -3220,8 +3230,8 @@
       <trans-unit id="f3e4fadb9e370a1e2c0c622c01fc8c77daf93a2c" resname="Export" approved="yes">
         <source>Export</source>
         <target state="translated">Exporteer</target>
-        <jms:reference-file line="165">Controller/Prod/DownloadController.php</jms:reference-file>
-        <jms:reference-file line="166">Controller/Prod/DownloadController.php</jms:reference-file>
+        <jms:reference-file line="177">Controller/Prod/DownloadController.php</jms:reference-file>
+        <jms:reference-file line="178">Controller/Prod/DownloadController.php</jms:reference-file>
         <jms:reference-file line="74">Controller/Prod/DoDownloadController.php</jms:reference-file>
         <jms:reference-file line="75">Controller/Prod/DoDownloadController.php</jms:reference-file>
         <jms:reference-file line="124">Controller/Prod/LanguageController.php</jms:reference-file>
@@ -3339,7 +3349,7 @@
       <trans-unit id="3491d2e44dd1896af3411bb1a048847c13647feb" resname="File is too big : 64k max" approved="yes">
         <source>File is too big : 64k max</source>
         <target state="translated">File is te groot : 64k max</target>
-        <jms:reference-file line="190">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="191">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="6efbe33ed8bd57bac1e804871a3ba254abe7903c" resname="File upload has been cancelled" approved="yes">
         <source>File upload has been cancelled</source>
@@ -4413,7 +4423,7 @@
       <trans-unit id="815d1b7d85075463e14c340ff9897a6c4af09ec3" resname="Missing &quot;structure&quot; parameter">
         <source>Missing "structure" parameter</source>
         <target state="new">Missing "structure" parameter</target>
-        <jms:reference-file line="152">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="153">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="a9b8f078d07adc678766fb9d2094292080ab3c52" resname="Missing labels parameter" approved="yes">
         <source>Missing labels parameter</source>
@@ -4429,7 +4439,7 @@
       <trans-unit id="0f79e8927b12fa1faaf351996f502775b4642c2d" resname="Missing path parameter" approved="yes">
         <source>Missing path parameter</source>
         <target state="translated">Pad parameter ontbreekt</target>
-        <jms:reference-file line="78">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="79">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="9321a86c28d944244ce11115d852e79d190b0bcd" resname="Missing target collection" approved="yes">
         <source>Missing target collection</source>
@@ -4439,7 +4449,7 @@
       <trans-unit id="b0def594904c1cbf973fce8978d282a64d446abb" resname="Missing tests parameter" approved="yes">
         <source>Missing tests parameter</source>
         <target state="translated">Test parameter ontbreekt</target>
-        <jms:reference-file line="74">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="75">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="80e8b9fbe625ab32ace339346a3721fe143f5c20" resname="Missing view name parameter" approved="yes">
         <source>Missing view name parameter</source>
@@ -5615,7 +5625,7 @@
       <trans-unit id="3cd74928930cda94205568949be186e4cae37119" resname="Record Not Found" approved="yes">
         <source>Record Not Found</source>
         <target state="translated">Document niet gevonden</target>
-        <jms:reference-file line="2092">Controller/Api/V1Controller.php</jms:reference-file>
+        <jms:reference-file line="2089">Controller/Api/V1Controller.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="ef0112aa634cbad5a586b72e4befe1ab1a39e73f" resname="Record removed from basket" approved="yes">
         <source>Record removed from basket</source>
@@ -6302,7 +6312,7 @@
       <trans-unit id="e348765b45777672fff0436326a7637de0c0f6b4" resname="Something wrong happend" approved="yes">
         <source>Something wrong happend</source>
         <target state="translated">Er is iets verkeerd gelopen</target>
-        <jms:reference-file line="199">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="200">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="1e4139b4c4a2bc0bf820cebbfa3ac7361a1b1e37" resname="Something wrong happened, please try again or contact an admin." approved="yes">
         <source>Something wrong happened, please try again or contact an admin.</source>
@@ -6391,12 +6401,12 @@
       <trans-unit id="31341706bd5a88f758389de7827bbedddf89f5d5" resname="Status icon upload failed : can not write on disk" approved="yes">
         <source>Status icon upload failed : can not write on disk</source>
         <target state="translated">Status icon upload niet gelukt : kan niet naar de schijf schrijven</target>
-        <jms:reference-file line="196">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="197">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="28fc4ae94e7aebff81825a9fbc91ba32ac6ad1ff" resname="Status icon upload failed : upload error" approved="yes">
         <source>Status icon upload failed : upload error</source>
         <target state="translated">Status icon upload niet gelukt : upload fout</target>
-        <jms:reference-file line="193">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="194">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="9e253470c876ee6d5c720eb777aeb82d4c26e28f" resname="Stop">
         <source>Stop</source>
@@ -6423,7 +6433,7 @@
       <trans-unit id="315bc332aafca63cad8ac042c2e2f5111544fe9d" resname="Story Not Found" approved="yes">
         <source>Story Not Found</source>
         <target state="translated">Artikel niet gevonden</target>
-        <jms:reference-file line="2546">Controller/Api/V1Controller.php</jms:reference-file>
+        <jms:reference-file line="2543">Controller/Api/V1Controller.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="94e347da85f4797810ed7987973c8ef79092057e" resname="Story created" approved="yes">
         <source>Story created</source>
@@ -7845,7 +7855,7 @@
       <trans-unit id="4faca55769348dcbc9714b19438181057aa2510e" resname="You do not enough rights to update status" approved="yes">
         <source>You do not enough rights to update status</source>
         <target state="translated">U hebt niet voldoende rechten om de status up te date</target>
-        <jms:reference-file line="187">Controller/Admin/RootController.php</jms:reference-file>
+        <jms:reference-file line="188">Controller/Admin/RootController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="97188aa994ca91d6fd389a9a6d282aff57695836" resname="You do not have access to this basket" approved="yes">
         <source>You do not have access to this basket</source>
@@ -9458,13 +9468,13 @@
       <trans-unit id="85d760f5a5e3b7c29f17485512d9225ccdd40811" resname="admin::users: password granted">
         <source>admin::users: password granted</source>
         <target state="new">admin::users: password granted</target>
-        <jms:reference-file line="107">admin/inspector/record-index.html.twig</jms:reference-file>
+        <jms:reference-file line="108">admin/inspector/record-index.html.twig</jms:reference-file>
         <jms:reference-file line="647">web/admin/editusers.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="74411bbacf01ba76709c7cf0135e7c4aeed0c180" resname="admin::users: password not granted">
         <source>admin::users: password not granted</source>
         <target state="new">admin::users: password not granted</target>
-        <jms:reference-file line="109">admin/inspector/record-index.html.twig</jms:reference-file>
+        <jms:reference-file line="110">admin/inspector/record-index.html.twig</jms:reference-file>
         <jms:reference-file line="647">web/admin/editusers.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="3c6e9df1925ca0ae9df114b4c17e7667ec66f5d7" resname="admin::users: provider">
@@ -10199,7 +10209,7 @@
       <trans-unit id="feab893253be204583342aa21a1c6e355f805969" resname="an error occured : %message%">
         <source>an error occured : %message%</source>
         <target state="new">an error occured : %message%</target>
-        <jms:reference-file line="214">Phrasea/Controller/SetupController.php</jms:reference-file>
+        <jms:reference-file line="211">Phrasea/Controller/SetupController.php</jms:reference-file>
       </trans-unit>
       <trans-unit id="1ef7d963f55e35dd090b87b48313d191a01a4cdb" resname="an error occured while exporting records" approved="yes">
         <source>an error occured while exporting records</source>

diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2024-06-07T03:59:03Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2024-07-18T14:57:31Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2024-06-07T03:59:21Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2024-07-18T14:57:50Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2024-06-07T03:59:42Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2024-07-18T14:58:09Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2024-06-07T04:00:05Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2024-07-18T14:58:32Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

diff --git a/templates/web/admin/subdefs.html.twig b/templates/web/admin/subdefs.html.twig
@@ -257,7 +257,7 @@
                 if (o.val().match(reg)[0].length !== o.val().length) {
                     ok = false;
                     o.addClass("ui-state-error");
-                    updateTips("Special characters (except minus) or espaces are not authorized");
+                    updateTips('{{ 'Allowed caracteres are only A-Z, a-z, 0-9 and hyphens eg: Preview-mobile-01' | trans }}');
                 }
 
                 return ok;
@@ -359,7 +359,7 @@
         </p>
     </div>
 
-    <div id="dialog-form" title="Create new subdef">
+    <div id="dialog-form" title="{{ 'Create new subdef' | trans  }}">
         <p class="validateTips"></p>
         <form>
             <fieldset>