diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js
index 00b2730418..7b1bdbf13f 100644
--- a/Phraseanet-production-client/config/config.js
+++ b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading
- assetFileVersion: 91
+ assetFileVersion: 92
};
diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js
index 75d7170446..eef05c259d 100644
--- a/Phraseanet-production-client/dist/authenticate.js
+++ b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
-/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=91";
+/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=92";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js
index eaf04b6fbc..1e11703f65 100644
--- a/Phraseanet-production-client/dist/authenticate.min.js
+++ b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
-/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=91";
+/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=92";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js
index 1d54a1bdb5..72933035c0 100644
--- a/Phraseanet-production-client/dist/commons.js
+++ b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
-/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=91";
+/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=92";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js
index dec81a6113..4671744f14 100644
--- a/Phraseanet-production-client/dist/commons.min.js
+++ b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
-/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=91";
+/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=92";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js
index 4f9c31609f..63f26f123f 100644
--- a/Phraseanet-production-client/dist/production.js
+++ b/Phraseanet-production-client/dist/production.js
@@ -70250,7 +70250,7 @@ var searchGeoForm = function searchGeoForm(services) {
var renderModal = function renderModal() {
// @TODO cleanup styles
- return '\n
\n
\n
\n
';
+ return '\n \n
\n
\n
';
};
var updateCircleGeo = function updateCircleGeo(params) {
diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
index 4f9c31609f..63f26f123f 100644
--- a/Phraseanet-production-client/dist/production.min.js
+++ b/Phraseanet-production-client/dist/production.min.js
@@ -70250,7 +70250,7 @@ var searchGeoForm = function searchGeoForm(services) {
var renderModal = function renderModal() {
// @TODO cleanup styles
- return '\n \n
\n
\n
';
+ return '\n \n
\n
\n
';
};
var updateCircleGeo = function updateCircleGeo(params) {
diff --git a/Phraseanet-production-client/src/components/search/geoSearch/searchGeoForm.js b/Phraseanet-production-client/src/components/search/geoSearch/searchGeoForm.js
index 80ba2d820b..5bdf6210cc 100644
--- a/Phraseanet-production-client/src/components/search/geoSearch/searchGeoForm.js
+++ b/Phraseanet-production-client/src/components/search/geoSearch/searchGeoForm.js
@@ -89,7 +89,7 @@ const searchGeoForm = (services) => {
return `
-
+
`;
};
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
index 60af8da75e..c44a24a4ce 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
@@ -194,6 +194,7 @@ public function getTranslationsAction()
'feedbackTitle' => $translator->trans('prod::dialog feedback title'),
'listmanagerTitle' => $translator->trans('prod::dialog listmanager title'),
'seeMore' => $translator->trans('prod::workzone:facet see more'),
+ 'Geolocalisation' => $translator->trans('preview::tab geolocalisation'),
]);
}
}
diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
index 7bd6dc02fc..34f120f19e 100644
--- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
+++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -62,7 +62,7 @@ public function getGlobals()
{
return [
// change this version when you change JS file to force the navigation to reload js file
- 'assetFileVersion' => 91
+ 'assetFileVersion' => 92
];
}
@@ -313,7 +313,7 @@ public function getDoctypeIcon(RecordInterface $record)
break;
case 'video':
$src = '/assets/common/images/icons/icon_video.png';
- $title = $this->app['translator']->trans('reportage');
+ $title = $this->app['translator']->trans('video');
break;
case 'audio':
$src = '/assets/common/images/icons/icon_audio.png';
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/ShareBasketWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/ShareBasketWorker.php
index fa9d9af874..98363a42da 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Worker/ShareBasketWorker.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/ShareBasketWorker.php
@@ -101,8 +101,9 @@ public function process(array $payload)
'eventsmanager_notify_basketwip',
// 'eventsmanager_notify_push',
json_encode([
- 'message' => $this->app->trans('notification:: Sharing basket "%name%"...', ['%name%' => htmlentities($basket->getName())]),
- ]),
+ 'translateMessage' => 'notification:: Sharing basket "%name%"...',
+ 'name' => htmlentities($basket->getName())
+ ]),
false
);
@@ -395,8 +396,9 @@ public function process(array $payload)
'eventsmanager_notify_basketwip',
// 'eventsmanager_notify_push',
json_encode([
- 'message' => $this->app->trans('notification:: Basket %name% is shared', ['%name%' => htmlentities($basket->getName())]),
- ]),
+ 'translateMessage' => 'notification:: Basket %name% is shared',
+ 'name' => htmlentities($basket->getName())
+ ]),
false
);
diff --git a/lib/classes/eventsmanager/notify/basketwip.php b/lib/classes/eventsmanager/notify/basketwip.php
index 0cf0b39a9f..ef3cc32be4 100644
--- a/lib/classes/eventsmanager/notify/basketwip.php
+++ b/lib/classes/eventsmanager/notify/basketwip.php
@@ -30,8 +30,15 @@ public function icon_url()
*/
public function datas(array $data, $unread)
{
+ if (isset($data['message'])) {
+ // to be retro compatible with old data value
+ $text = $data['message'];
+ } else {
+ $text = $this->app->trans($data['translateMessage'], ['%name%' => $data['name']]);
+ }
+
$ret = [
- 'text' => $data['message'],
+ 'text' => $text,
'class' => ($unread == 1 ? 'reload_baskets' : '')
];
diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php
index 57f72d7c54..d3b4aa1a73 100644
--- a/lib/classes/eventsmanager/notify/validate.php
+++ b/lib/classes/eventsmanager/notify/validate.php
@@ -59,7 +59,18 @@ public function datas(array $data, $unread)
. '" target="_blank">'
. htmlentities($basket_name) . '';
- $text = $isVoteBasket ? '%user% vous demande de valider %title%' : "notification:: Basket '%title%' shared from %user%";
+ if ($isVoteBasket) {
+ $text = $this->app->trans('%user% vous demande de valider %title%', [
+ '%user%' => htmlentities($sender),
+ '%title%' => $bask_link,
+ ]);
+
+ } else {
+ $text = $this->app->trans("notification:: Basket '%title%' shared from %user%", [
+ '%user%' => htmlentities($sender),
+ '%title%' => $bask_link,
+ ]);
+ }
$ret = [
'text' => $this->app->trans($text, [
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index cdb5edd4fd..cf7c022f77 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/Configuration/EmailFormType.php
Form/Login/PhraseaAuthenticationForm.php
@@ -17,11 +17,6 @@
Hinzufügen
admin/fields/templates.html.twig
-
-
- Ergebnis %number% / %total%
- prod/preview/title.html.twig
-
#3567c6
@@ -200,7 +195,7 @@
Bridge/Dailymotion/element_informations.html.twig
-
+
ausgewählt]]>
Controller/Prod/QueryController.php
@@ -350,6 +345,11 @@
%user% hat Ihnen einen %before_link% Sammelkorb %after_link% gesendet
eventsmanager/notify/push.php
+
+
+ %user% vous demande de valider %title%
+ eventsmanager/notify/validate.php
+
%user_count% Benutzer wurden erstellt
@@ -2539,7 +2539,7 @@
Form/Configuration/ActionsFormType.php
-
+
Anzeige und Handlung-Einstellungen
admin/fields/templates.html.twig
@@ -5523,7 +5523,7 @@
Einer Benachrichtigung über Push, geteilte und Feedback Sammelkörbe erhalten
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
@@ -5818,6 +5818,11 @@
Download Einschränkungen
web/admin/editusers_quotas.html.twig
+
+
+ Ergebnis %number% / %total%
+ prod/preview/title.html.twig
+
Zurück
@@ -7149,8 +7154,8 @@
Unbekannter Benutzer %usr_id%
- WorkerManager/Worker/ShareBasketWorker.php
- WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
@@ -7344,7 +7349,7 @@
Feedback
eventsmanager/notify/validate.php
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
eventsmanager/notify/validationdone.php
eventsmanager/notify/validationreminder.php
eventsmanager/notify/validationreminder.php
@@ -9459,7 +9464,7 @@
Leere Warteschlangen ausblenden
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -9479,7 +9484,7 @@
Nur verbrauchte Warteschlange anzeigen
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -11738,25 +11743,20 @@
web/lightbox/validate.html.twig
web/lightbox/feed.html.twig
-
-
- Sammelkorb %name% wurde geteilt
- WorkerManager/Worker/ShareBasketWorker.php
+
+
+ notification:: Basket '%title%' shared from %user%
+ eventsmanager/notify/validate.php
Sammelkorbteilung im Gange
- eventsmanager/notify/basketwip.php
+ eventsmanager/notify/basketwip.php
Eine Benachrichtigung über geteilte Sammelkörbe erhalten
- eventsmanager/notify/basketwip.php
-
-
-
- Teilung des Sammelkorbs "%name%"...
- WorkerManager/Worker/ShareBasketWorker.php
+ eventsmanager/notify/basketwip.php
@@ -12382,7 +12382,7 @@
Controller/Root/AccountController.php
-
+
Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden.
web/account/account.html.twig
@@ -12648,6 +12648,11 @@
Ansicht Statistiken
prod/preview/popularity.html.twig
+
+
+ preview::tab geolocalisation
+ Controller/Prod/LanguageController.php
+
Feedback
@@ -15518,7 +15523,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben
web/thesaurus/thesaurus.html.twig
-
+
web/thesaurus/thesaurus.html.twig
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index 0045d98a58..c10153dc69 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.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/Configuration/EmailFormType.php
Form/Login/PhraseaAuthenticationForm.php
@@ -17,11 +17,6 @@
Add
admin/fields/templates.html.twig
-
-
- Result %number% / %total%
- prod/preview/title.html.twig
-
#3567c6
@@ -200,7 +195,7 @@
Bridge/Dailymotion/element_informations.html.twig
-
+
selected]]>
Controller/Prod/QueryController.php
@@ -350,6 +345,11 @@
%user% has sent you a %before_link% basket %after_link%
eventsmanager/notify/push.php
+
+
+ %user% vous demande de valider %title%
+ eventsmanager/notify/validate.php
+
%user_count% users have been created.
@@ -2542,7 +2542,7 @@
Form/Configuration/ActionsFormType.php
-
+
Display and action settings
admin/fields/templates.html.twig
@@ -5526,7 +5526,7 @@
Receive notification of Push, shared and Feedback baskets
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
@@ -5821,6 +5821,11 @@
Download quotas
web/admin/editusers_quotas.html.twig
+
+
+ Result %number% / %total%
+ prod/preview/title.html.twig
+
Return
@@ -7152,8 +7157,8 @@
Unknown user %usr_id%
- WorkerManager/Worker/ShareBasketWorker.php
- WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
@@ -7347,7 +7352,7 @@
Feedback
eventsmanager/notify/validate.php
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
eventsmanager/notify/validationdone.php
eventsmanager/notify/validationreminder.php
eventsmanager/notify/validationreminder.php
@@ -9462,7 +9467,7 @@
Hide empty queues
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -9482,7 +9487,7 @@
Display only consumed queues
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -11741,25 +11746,20 @@
web/lightbox/validate.html.twig
web/lightbox/feed.html.twig
-
-
- Basket " %name% " has been shared
- WorkerManager/Worker/ShareBasketWorker.php
+
+
+ notification:: Basket '%title%' shared from %user%
+ eventsmanager/notify/validate.php
Basket sharing in progress
- eventsmanager/notify/basketwip.php
+ eventsmanager/notify/basketwip.php
Receive notifications for shared baskets
- eventsmanager/notify/basketwip.php
-
-
-
- Sharing basket "%name%"...
- WorkerManager/Worker/ShareBasketWorker.php
+ eventsmanager/notify/basketwip.php
@@ -12385,7 +12385,7 @@
Controller/Root/AccountController.php
-
+
Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface.
web/account/account.html.twig
@@ -12651,6 +12651,11 @@
View statistics
prod/preview/popularity.html.twig
+
+
+ preview::tab geolocalisation
+ Controller/Prod/LanguageController.php
+
Feedback
@@ -15524,7 +15529,7 @@ It is possible to place several search areas
web/thesaurus/thesaurus.html.twig
-
+
web/thesaurus/thesaurus.html.twig
diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 5cbc6717be..05ee44b4df 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/Configuration/EmailFormType.php
Form/Login/PhraseaAuthenticationForm.php
@@ -17,11 +17,6 @@
Ajouter
admin/fields/templates.html.twig
-
-
- Résultat %number% / %total%
- prod/preview/title.html.twig
-
#3567c6
@@ -200,7 +195,7 @@
Bridge/Dailymotion/element_informations.html.twig
-
+
sélectionnés]]>
Controller/Prod/QueryController.php
@@ -350,6 +345,11 @@
%user% vous a adressé un %before_link% panier %after_link%
eventsmanager/notify/push.php
+
+
+ %user% vous demande de valider %title%
+ eventsmanager/notify/validate.php
+
%user_count% utilisateurs ont été créés.
@@ -2539,7 +2539,7 @@
Form/Configuration/ActionsFormType.php
-
+
Paramétrage d'affichage et d'action
admin/fields/templates.html.twig
@@ -5523,7 +5523,7 @@
Réception d'une notification des paniers de Push, de partage et de Feedback
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
@@ -5818,6 +5818,11 @@
Restrictions de téléchargement
web/admin/editusers_quotas.html.twig
+
+
+ Résultat %number% / %total%
+ prod/preview/title.html.twig
+
Retour
@@ -7149,8 +7154,8 @@
Utilisateur inconnu %usr_id%
- WorkerManager/Worker/ShareBasketWorker.php
- WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
@@ -7344,7 +7349,7 @@
Validation
eventsmanager/notify/validate.php
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
eventsmanager/notify/validationdone.php
eventsmanager/notify/validationreminder.php
eventsmanager/notify/validationreminder.php
@@ -9460,7 +9465,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Masquer les queues vides
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -9480,7 +9485,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Afficher uniquement les files de messages consommées
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -11739,25 +11744,20 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
web/lightbox/validate.html.twig
web/lightbox/feed.html.twig
-
-
- Le panier %name% a été partagé
- WorkerManager/Worker/ShareBasketWorker.php
+
+
+ notification:: Basket '%title%' shared from %user%
+ eventsmanager/notify/validate.php
Partage de panier en cours
- eventsmanager/notify/basketwip.php
+ eventsmanager/notify/basketwip.php
Recevoir une notification pour un panier partagé
- eventsmanager/notify/basketwip.php
-
-
-
- Partage du panier "%name%"...
- WorkerManager/Worker/ShareBasketWorker.php
+ eventsmanager/notify/basketwip.php
@@ -12383,7 +12383,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Controller/Root/AccountController.php
-
+
Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration.
web/account/account.html.twig
@@ -12649,6 +12649,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Statistiques de visualisation
prod/preview/popularity.html.twig
+
+
+ preview::tab geolocalisation
+ Controller/Prod/LanguageController.php
+
Validation
@@ -15527,7 +15532,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles
web/thesaurus/thesaurus.html.twig
-
+
web/thesaurus/thesaurus.html.twig
diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf
index f18962bedf..398999cce7 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.
@@ -17,13 +17,6 @@
Add
admin/fields/templates.html.twig
-
-
- Resultat %number% / %total%
-
- prod/preview/title.html.twig
-
#3567c6
@@ -352,6 +345,11 @@
%user% vous a envoye un %before_link% panier %after_link%
eventsmanager/notify/push.php
+
+
+ %user% vous demande de valider %title%
+ eventsmanager/notify/validate.php
+
%user_count% users have been created.
@@ -5531,7 +5529,7 @@
Meldingen ontvangen wanneer mij een aanvraag tot goedkeuring wordt gevraagd
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
@@ -5826,6 +5824,11 @@
Download beperkingen
web/admin/editusers_quotas.html.twig
+
+
+ Resultat %number% / %total%
+ prod/preview/title.html.twig
+
Terug
@@ -7157,8 +7160,8 @@
Unknown user %usr_id%
- WorkerManager/Worker/ShareBasketWorker.php
- WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
+ WorkerManager/Worker/ShareBasketWorker.php
@@ -7352,7 +7355,7 @@
Goedkeuring
eventsmanager/notify/validate.php
- eventsmanager/notify/validate.php
+ eventsmanager/notify/validate.php
eventsmanager/notify/validationdone.php
eventsmanager/notify/validationreminder.php
eventsmanager/notify/validationreminder.php
@@ -9467,7 +9470,7 @@
admin::workermanager:tab:queueMonitor: Hide empty queues
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -9487,7 +9490,7 @@
admin::workermanager:tab:queueMonitor: consumed queues
- admin/worker-manager/worker_queue_monitor.html.twig
+ admin/worker-manager/worker_queue_monitor.html.twig
@@ -11746,25 +11749,20 @@
web/lightbox/validate.html.twig
web/lightbox/feed.html.twig
-
-
- notification:: Basket %name% is shared
- WorkerManager/Worker/ShareBasketWorker.php
+
+
+ notification:: Basket '%title%' shared from %user%
+ eventsmanager/notify/validate.php
notification:: Basket WIP
- eventsmanager/notify/basketwip.php
+ eventsmanager/notify/basketwip.php
notification:: Receive notification when a basket is WIP
- eventsmanager/notify/basketwip.php
-
-
-
- notification:: Sharing basket "%name%"...
- WorkerManager/Worker/ShareBasketWorker.php
+ eventsmanager/notify/basketwip.php
@@ -12656,6 +12654,11 @@
Statistieken per bezoek van de link
prod/preview/popularity.html.twig
+
+
+ preview::tab geolocalisation
+ Controller/Prod/LanguageController.php
+
preview::tab:feedback
diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf
index 1693bb8968..b803cd2066 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 505807b93f..2298d4b9de 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 3884a16328..2ee039ffd7 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 20d7e72890..09450804be 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/templates/web/prod/preview/title.html.twig b/templates/web/prod/preview/title.html.twig
index 6fc72e853f..409499994a 100644
--- a/templates/web/prod/preview/title.html.twig
+++ b/templates/web/prod/preview/title.html.twig
@@ -4,9 +4,7 @@
{% trans with {
'%number%' : '' ~ record.formatNumber(record.getNumber() + 1) ~ '',
'%total%' : record.formatNumber(record.total)
- } %}
- Resultat %number% / %total%
- {% endtrans %}
+ } %}Resultat %number% / %total%{% endtrans %}
{{ record.get_title() }}
{% elseif record.env == "BASK" %}