From 77a49c8c41e502adef5f9de82b698eef16146021 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 10 Mar 2021 16:14:10 +0300 Subject: [PATCH 1/2] add mailto on initiator --- resources/locales/messages.de.xlf | 43 +++++++++++-------- resources/locales/messages.en.xlf | 33 ++++++++------ resources/locales/messages.fr.xlf | 33 ++++++++------ resources/locales/messages.nl.xlf | 21 +++++---- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../web/prod/preview/voting_notice.html.twig | 7 ++- 9 files changed, 85 insertions(+), 60 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index c404e8b880..8de4c5fba0 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 @@ -3229,10 +3229,10 @@ prod/WorkZone/Macros.html.twig prod/WorkZone/Story.html.twig - + Feedback:: Requested by %initiator% on %createdDate% Angefordert von %initiator% am %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3914,22 +3914,22 @@ L'utilisateur approuve ce document Benutzer genehmigt dieses Dokument - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document Benutzer lehnt dieses Dokument ab - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document Benutzer hat seine Meinung noch nicht gegeben - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -5838,7 +5838,7 @@ Download Einschränkungen web/admin/editusers_quotas.html.twig - + Resultat %number% / %total% Ergebnis %number% / %total% classes/record/preview.php @@ -7409,7 +7409,7 @@ Gesendete Bestätigungen WorkZone/Browser/Browser.html.twig - + Validity period of the download links Download-Links Gültigkeitsdauer Form/Configuration/ActionsFormType.php @@ -8287,7 +8287,7 @@ Version web/admin/databases.html.twig - + admin::base: Warning Worker is in process to indexing the same databox Indexierung ist bereits im Gange für diese Databox admin/databox/databox.html.twig @@ -11797,22 +11797,27 @@ Ansicht Statistiken prod/preview/popularity.html.twig - + preview::tab:feedback Bestätigung web/prod/index.html.twig - + preview::tab:feedback closed Geschlossen prod/preview/voting_notice.html.twig - + preview::tab:feedback list Bestätigungen Liste prod/preview/voting_notice.html.twig - + + preview::tab:feedback mail subject + preview::tab:feedback mail subject + prod/preview/voting_notice.html.twig + + preview::tab:feedback open Geöffnet prod/preview/voting_notice.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index ae258126ac..2ffa9c0722 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 @@ -2907,7 +2907,7 @@ Enable FTP for users Form/Configuration/FtpExportFormType.php - + Enable Forcing authentication to see push content Enable the force authentication option for Push and Feedback sessions Form/Configuration/ActionsFormType.php @@ -3235,7 +3235,7 @@ Feedback:: Requested by %initiator% on %createdDate% Requested by %initiator% on %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3917,22 +3917,22 @@ L'utilisateur approuve ce document User approves this document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document User disapproves this document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document User hasn't decided yet - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -8290,7 +8290,7 @@ Version web/admin/databases.html.twig - + admin::base: Warning Worker is in process to indexing the same databox Indexation already in progress on this databox admin/databox/databox.html.twig @@ -11810,11 +11810,16 @@ Closed prod/preview/voting_notice.html.twig - + preview::tab:feedback list Feedback List prod/preview/voting_notice.html.twig + + preview::tab:feedback mail subject + preview::tab:feedback mail subject + prod/preview/voting_notice.html.twig + preview::tab:feedback open Open diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 01645dcfdf..c6e213879d 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 @@ -3232,7 +3232,7 @@ Feedback:: Requested by %initiator% on %createdDate% Demandé par %initiator% le %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3914,22 +3914,22 @@ L'utilisateur approuve ce document L'utilisateur approuve ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document L'utilisateur désapprouve ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document L'utilisateur n'a pas encore donné son avis sur ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11805,17 +11805,22 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Validation web/prod/index.html.twig - + preview::tab:feedback closed Fermée prod/preview/voting_notice.html.twig - + preview::tab:feedback list Liste des validations prod/preview/voting_notice.html.twig - + + preview::tab:feedback mail subject + preview::tab:feedback mail subject + prod/preview/voting_notice.html.twig + + preview::tab:feedback open Ouverte prod/preview/voting_notice.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 0dc3b75c89..9a00e7249c 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. @@ -3242,7 +3242,7 @@ Feedback:: Requested by %initiator% on %createdDate% Feedback:: Requested by %initiator% on %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3924,22 +3924,22 @@ L'utilisateur approuve ce document De gebruiker keurt dit document goed - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document De gebruiker keurt dit document af - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document De gebruiker heeft nog zijn mening niet gegeven over dit document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11822,6 +11822,11 @@ preview::tab:feedback list prod/preview/voting_notice.html.twig + + preview::tab:feedback mail subject + preview::tab:feedback mail subject + prod/preview/voting_notice.html.twig + preview::tab:feedback open preview::tab:feedback open diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 755d4269f1..db8159c2b7 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 a38a2b87a8..23f0ceefd5 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 82bbde6364..4bb4b6189b 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 7ca53230c9..ddd1885cd6 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/voting_notice.html.twig b/templates/web/prod/preview/voting_notice.html.twig index 0b11797251..b15da9daea 100644 --- a/templates/web/prod/preview/voting_notice.html.twig +++ b/templates/web/prod/preview/voting_notice.html.twig @@ -15,7 +15,12 @@ {% endif %}
- {% set initiator = validationSession.getInitiator().getDisplayName() %} + {% set initiator %} + + {{ validationSession.getInitiator().getDisplayName() }} + + {% endset %} + {% set createdDate = app['date-formatter'].getDateTranslated(validationSession.getCreated()) %} {% trans with {'%initiator%' : initiator, '%createdDate%': createdDate} %}Feedback:: Requested by %initiator% on %createdDate%{% endtrans %} From 8430b835e2ca0ae42dd95835875f3207fca61381 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 10 Mar 2021 16:43:36 +0300 Subject: [PATCH 2/2] change subject string --- resources/locales/messages.de.xlf | 22 +++++++++---------- resources/locales/messages.en.xlf | 22 +++++++++---------- resources/locales/messages.fr.xlf | 22 +++++++++---------- resources/locales/messages.nl.xlf | 22 +++++++++---------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../web/prod/preview/voting_notice.html.twig | 5 +++-- 9 files changed, 51 insertions(+), 50 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 8de4c5fba0..68a2fba54f 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.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. @@ -3232,7 +3232,7 @@ Feedback:: Requested by %initiator% on %createdDate% Angefordert von %initiator% am %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3914,22 +3914,22 @@ L'utilisateur approuve ce document Benutzer genehmigt dieses Dokument - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document Benutzer lehnt dieses Dokument ab - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document Benutzer hat seine Meinung noch nicht gegeben - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11805,7 +11805,7 @@ preview::tab:feedback closed Geschlossen - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback list @@ -11815,12 +11815,12 @@ preview::tab:feedback mail subject preview::tab:feedback mail subject - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback open Geöffnet - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::visualisation diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 2ffa9c0722..c58adc34d9 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. @@ -3235,7 +3235,7 @@ Feedback:: Requested by %initiator% on %createdDate% Requested by %initiator% on %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3917,22 +3917,22 @@ L'utilisateur approuve ce document User approves this document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document User disapproves this document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document User hasn't decided yet - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11808,7 +11808,7 @@ preview::tab:feedback closed Closed - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback list @@ -11818,12 +11818,12 @@ preview::tab:feedback mail subject preview::tab:feedback mail subject - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback open Open - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::visualisation diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index c6e213879d..a349c2df54 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.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. @@ -3232,7 +3232,7 @@ Feedback:: Requested by %initiator% on %createdDate% Demandé par %initiator% le %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3914,22 +3914,22 @@ L'utilisateur approuve ce document L'utilisateur approuve ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document L'utilisateur désapprouve ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document L'utilisateur n'a pas encore donné son avis sur ce document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11808,7 +11808,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le preview::tab:feedback closed Fermée - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback list @@ -11818,12 +11818,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le preview::tab:feedback mail subject preview::tab:feedback mail subject - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback open Ouverte - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::visualisation diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 9a00e7249c..aa2cf553d1 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. @@ -3242,7 +3242,7 @@ Feedback:: Requested by %initiator% on %createdDate% Feedback:: Requested by %initiator% on %createdDate% - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig Feeds @@ -3924,22 +3924,22 @@ L'utilisateur approuve ce document De gebruiker keurt dit document goed - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document De gebruiker keurt dit document af - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document De gebruiker heeft nog zijn mening niet gegeven over dit document - prod/preview/voting_notice.html.twig - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig prod/WorkZone/Macros.html.twig @@ -11815,7 +11815,7 @@ preview::tab:feedback closed preview::tab:feedback closed - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback list @@ -11825,12 +11825,12 @@ preview::tab:feedback mail subject preview::tab:feedback mail subject - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::tab:feedback open preview::tab:feedback open - prod/preview/voting_notice.html.twig + prod/preview/voting_notice.html.twig preview::visualisation diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index db8159c2b7..c7a161f0ba 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 23f0ceefd5..def3f0a2dc 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 4bb4b6189b..710a4e0c6f 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 ddd1885cd6..6412dccff1 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/voting_notice.html.twig b/templates/web/prod/preview/voting_notice.html.twig index b15da9daea..fd581320d0 100644 --- a/templates/web/prod/preview/voting_notice.html.twig +++ b/templates/web/prod/preview/voting_notice.html.twig @@ -4,9 +4,10 @@ {% set basket = basket_element.getBasket() %} {% set validationSession = basket.getValidation() %} {% if validationSession.isParticipant(app.getAuthenticatedUser()) and (validationSession.getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationSession.getParticipant(app.getAuthenticatedUser()).getUser() == app.getAuthenticatedUser() )%} + {% set basketName = basket.getName() %}