Merge branch 'master' into PHRAS-2069-integrate-plugin-updatemetadata…

…-to-core

lib/Alchemy/Phrasea/WorkerManager/Worker/ShareBasketWorker.php

@@ -101,7 +101,7 @@ public function process(array $payload)
             'eventsmanager_notify_basketwip',
             // 'eventsmanager_notify_push',
             json_encode([
-                'translateMessage' => 'notification:: Sharing basket "%name%"...',
+                'translateMessage' => 'text1',
                 'name'             => htmlentities($basket->getName())
                 ]),
             false
@@ -396,7 +396,7 @@ public function process(array $payload)
             'eventsmanager_notify_basketwip',
             // 'eventsmanager_notify_push',
             json_encode([
-                'translateMessage' => 'notification:: Basket %name% is shared',
+                'translateMessage' => 'text2',
                 'name'    => htmlentities($basket->getName())
                 ]),
             false

lib/Alchemy/Phrasea/WorkerManager/Worker/SubtitleWorker.php

@@ -244,7 +244,6 @@ public function process(array $payload)
                 $payload['authenticatedUserId'],
                 'eventsmanager_notify_subtitle',
                 json_encode([
-                    'translateMessage' => 'notification:: subtitle "%langues%" generated for "%title%" !',
                     'langues'          => implode(', ', array_keys($payload['languageDestination'])),
                     'title'            => htmlentities($record->get_title())
                 ]),

lib/classes/eventsmanager/notify/basketwip.php

@@ -34,7 +34,11 @@ public function datas(array $data, $unread)
             // to be retro compatible with old data value
             $text = $data['message'];
         } else {
-            $text = $this->app->trans($data['translateMessage'], ['%name%' => $data['name']]);
+            if ($data['translateMessage'] == 'text1') {
+                $text = $this->app->trans('notification:: Sharing basket "%name%"...', ['%name%' => $data['name']]);
+            } else {
+                $text = $this->app->trans('notification:: Basket %name% is shared', ['%name%' => $data['name']]);
+            }
         }
 
         $ret = [

lib/classes/eventsmanager/notify/subtitle.php

@@ -30,7 +30,7 @@ public function icon_url()
      */
     public function datas(array $data, $unread)
     {
-        $text = $this->app->trans($data['translateMessage'], ['%title%' => $data['title'], '%langues%' => $data['langues']]);
+        $text = $this->app->trans('notification:: subtitle "%langues%" generated for "%title%" !', ['%title%' => $data['title'], '%langues%' => $data['langues']]);
 
         return [
             'text'  => $text,

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="2023-11-20T14:57:43Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2023-11-23T15:53:32Z" 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>

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="2023-11-20T14:57:58Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2023-11-23T15:53:48Z" 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>

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="2023-11-20T14:58:17Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2023-11-23T15:54:08Z" 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>

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="2023-11-20T14:58:39Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2023-11-23T15:54:30Z" 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>