diff --git a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php index 39a0a8f48d..86c8baa370 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php @@ -243,8 +243,8 @@ class FeedController extends Controller 'texte' => '

' . $this->app->trans( 'publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.' ) . '

' . $this->app->trans('publications::Ne le partagez pas, il est strictement confidentiel') . '

-
', +
', 'titre' => $this->app->trans('publications::votre rss personnel'), ]); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php index 65f72a8a36..20291ec2c3 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php @@ -69,7 +69,7 @@ class ToolsController extends Controller continue; } $label = $this->app->trans('prod::tools: document'); - } elseif ($databoxSubdefs->hasSubdef($subdefName)) { + } elseif ($databoxSubdefs !== null && $databoxSubdefs->hasSubdef($subdefName)) { if (!$acl->has_access_to_subdef($record, $subdefName)) { continue; } diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 606ba039ba..3aa4cd64cb 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -6695,7 +6695,7 @@ The provided date is null! Angegebenes Datum ist NULL! - Controller/Prod/PushController.php + Controller/Prod/PushController.php The publication has been stopped @@ -7061,7 +7061,7 @@ Unable to save the expiration date Unmöglich, Ablaufsdatum zu speichern - Controller/Prod/PushController.php + Controller/Prod/PushController.php Unable to send the documents @@ -11834,6 +11834,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben Controller/Prod/FeedController.php Controller/Prod/FeedController.php + + publications::copy + publications::copy + Controller/Prod/FeedController.php + publications::votre rss personnel Ihr eigenes RSS @@ -12645,7 +12650,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben Archivierung zur Datenbank/Kollektion task-manager/task-editor/archive.html.twig - + task::archive:copier les fichiers '.phrasea.xml' et '.grouping.xml' dans _archived Copy '.phrasea.xml' and 'groupin.xml' files to _archive task-manager/task-editor/archive.html.twig @@ -12893,7 +12898,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben - Diese Verzweigung löschen?
 (die betroffenende Begriffe werden als mögliche Begriffe beim nächsten Indexierung erscheinen) + web/thesaurus/thesaurus.html.twig @@ -13183,12 +13188,12 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben Alle Datensätze wieder indexieren web/thesaurus/link-field-step3.html.twig - + thesaurus:: removed tgt removed tgt web/thesaurus/accept.html.twig - + thesaurus:: removed_src removed_src web/thesaurus/accept.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index a7794e3c9e..7a00687905 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. @@ -6698,7 +6698,7 @@ The provided date is null! The provided date is null! - Controller/Prod/PushController.php + Controller/Prod/PushController.php The publication has been stopped @@ -7064,7 +7064,7 @@ Unable to save the expiration date Unable to save the expiration date - Controller/Prod/PushController.php + Controller/Prod/PushController.php Unable to send the documents @@ -11840,6 +11840,11 @@ It is possible to place several search areas Controller/Prod/FeedController.php Controller/Prod/FeedController.php + + publications::copy + publications::copy + Controller/Prod/FeedController.php + publications::votre rss personnel Your own rss diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index a5907e3ab7..845dd56a19 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Login/PhraseaAuthenticationForm.php Form/Configuration/EmailFormType.php @@ -6697,7 +6697,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The provided date is null! The provided date is null! - Controller/Prod/PushController.php + Controller/Prod/PushController.php The publication has been stopped @@ -7063,7 +7063,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to save the expiration date Impossible de sauvegarder la date d'expiration - Controller/Prod/PushController.php + Controller/Prod/PushController.php Unable to send the documents @@ -11696,7 +11696,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Enregistrement(s) déplacé(s) dans la corbeille. prod/actions/delete_records_confirm_form.html.twig - + prod:app trash: record-to-delete Enregistrement(s) définitivement supprimé(s) prod/actions/delete_records_confirm_form.html.twig @@ -11843,6 +11843,11 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Controller/Prod/FeedController.php Controller/Prod/FeedController.php + + publications::copy + publications::copy + Controller/Prod/FeedController.php + publications::votre rss personnel Votre rss personnel @@ -13564,7 +13569,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod/WorkZone/Basket.html.twig prod/Tooltip/Basket.html.twig - + workzone:feedback:update Valider la nouvelle date de cloture prod/WorkZone/Basket.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 4edba352b9..6354d39ef6 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. @@ -6705,7 +6705,7 @@ The provided date is null! The provided date is null! - Controller/Prod/PushController.php + Controller/Prod/PushController.php The publication has been stopped @@ -7071,7 +7071,7 @@ Unable to save the expiration date Unable to save the expiration date - Controller/Prod/PushController.php + Controller/Prod/PushController.php Unable to send the documents @@ -11843,6 +11843,11 @@ Controller/Prod/FeedController.php Controller/Prod/FeedController.php + + publications::copy + publications::copy + Controller/Prod/FeedController.php + publications::votre rss personnel Uw persoonlijke rss feed diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index b8c4f7efa5..adc0a5c4c1 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 7587ec182c..335fdceba6 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 756b1ef761..2b23edf806 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 fa28a1a6ca..2f489cfb21 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/yarn.lock b/yarn.lock index 9ced059222..36921b750c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,6 +7577,7 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" + phraseanet-production-client@0.34.181-d: version "0.34.181-d" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.181-d.tgz#19e321f98820db14ff3bff2f2fc8cba0f16d8a27"