Add sender and submitter variables to email template dropdown

- Expose sender.name, sender.first_name, sender.email in all email type variable dropdowns
- Expose submitter.name, submitter.first_name, submitter.email in all email type variable dropdowns
- Add i18n translations for new variables across all 7 locales (EN, ES, IT, FR, PT, DE, NL)
- Fix logo form Save button: change f.submit to f.button to render HTML correctly
pull/681/head
Sebastian Noe 1 month ago
parent 197ee4345b
commit 812c162ea2

@ -62,10 +62,10 @@ class AccountConfig < ApplicationRecord
ENABLE_MCP_KEY = 'enable_mcp' ENABLE_MCP_KEY = 'enable_mcp'
EMAIL_VARIABLES = { EMAIL_VARIABLES = {
SUBMITTER_INVITATION_EMAIL_KEY => %w[template.name submitter.link account.name].freeze, SUBMITTER_INVITATION_EMAIL_KEY => %w[template.name submitter.link account.name sender.name sender.first_name sender.email submitter.name submitter.first_name submitter.email].freeze,
SUBMITTER_COMPLETED_EMAIL_KEY => %w[template.name submission.submitters submission.link].freeze, SUBMITTER_COMPLETED_EMAIL_KEY => %w[template.name submission.submitters submission.link sender.name sender.first_name sender.email submitter.name submitter.first_name submitter.email].freeze,
SUBMITTER_INVITATION_REMINDER_EMAIL_KEY => %w[template.name submitter.link account.name].freeze, SUBMITTER_INVITATION_REMINDER_EMAIL_KEY => %w[template.name submitter.link account.name sender.name sender.first_name sender.email submitter.name submitter.first_name submitter.email].freeze,
SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => %w[template.name documents.link account.name].freeze SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => %w[template.name documents.link account.name sender.name sender.first_name sender.email submitter.name submitter.first_name submitter.email].freeze
}.freeze }.freeze
DEFAULT_VALUES = { DEFAULT_VALUES = {

@ -29,6 +29,6 @@
</label> </label>
</file-dropzone> </file-dropzone>
<div class="form-control mt-4"> <div class="form-control mt-4">
<%= f.submit button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %> <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>
</div> </div>
<% end %> <% end %>

@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<% if local_assigns[:variables]&.any? %> <% if local_assigns[:variables]&.any? %>
<% variable_labels = { 'account.name' => t('variables.account_name'), 'submitter.link' => t('variables.submitter_link'), 'template.name' => t('variables.template_name'), 'submission.submitters' => t('variables.submission_submitters'), 'submission.link' => t('variables.submission_link'), 'documents.link' => t('variables.documents_link') } %> <% variable_labels = { 'account.name' => t('variables.account_name'), 'submitter.link' => t('variables.submitter_link'), 'template.name' => t('variables.template_name'), 'submission.submitters' => t('variables.submission_submitters'), 'submission.link' => t('variables.submission_link'), 'documents.link' => t('variables.documents_link'), 'sender.name' => t('variables.sender_name'), 'sender.first_name' => t('variables.sender_first_name'), 'sender.email' => t('variables.sender_email'), 'submitter.name' => t('variables.submitter_name'), 'submitter.first_name' => t('variables.submitter_first_name'), 'submitter.email' => t('variables.submitter_email') } %>
<div class="dropdown dropdown-end ml-auto"> <div class="dropdown dropdown-end ml-auto">
<label tabindex="0" class="flex items-center gap-1 text-sm px-2 py-1 rounded hover:bg-base-200 cursor-pointer"> <label tabindex="0" class="flex items-center gap-1 text-sm px-2 py-1 rounded hover:bg-base-200 cursor-pointer">
<%= t('add_variable') %> <%= t('add_variable') %>

@ -1056,6 +1056,12 @@ en: &en
submission_submitters: Submitters list submission_submitters: Submitters list
submission_link: Submission link submission_link: Submission link
documents_link: Documents link documents_link: Documents link
sender_name: Sender name
sender_first_name: Sender first name
sender_email: Sender email
submitter_name: Submitter name
submitter_first_name: Submitter first name
submitter_email: Submitter email
time: time:
formats: formats:
detailed: "%B %d, %Y %H:%M:%S" detailed: "%B %d, %Y %H:%M:%S"
@ -2097,6 +2103,12 @@ es: &es
submission_submitters: Lista de firmantes submission_submitters: Lista de firmantes
submission_link: Enlace del envío submission_link: Enlace del envío
documents_link: Enlace de los documentos documents_link: Enlace de los documentos
sender_name: Nombre del remitente
sender_first_name: Nombre de pila del remitente
sender_email: Email del remitente
submitter_name: Nombre del firmante
submitter_first_name: Nombre de pila del firmante
submitter_email: Email del firmante
time: time:
formats: formats:
detailed: "%-d de %B de %Y %H:%M:%S" detailed: "%-d de %B de %Y %H:%M:%S"
@ -3139,6 +3151,12 @@ it: &it
submission_submitters: Lista dei firmatari submission_submitters: Lista dei firmatari
submission_link: Link dell'invio submission_link: Link dell'invio
documents_link: Link dei documenti documents_link: Link dei documenti
sender_name: Nome del mittente
sender_first_name: Nome di battesimo del mittente
sender_email: Email del mittente
submitter_name: Nome del firmatario
submitter_first_name: Nome di battesimo del firmatario
submitter_email: Email del firmatario
time: time:
formats: formats:
detailed: "%d %B %Y %H:%M:%S" detailed: "%d %B %Y %H:%M:%S"
@ -4177,6 +4195,12 @@ fr: &fr
submission_submitters: Liste des signataires submission_submitters: Liste des signataires
submission_link: Lien de la soumission submission_link: Lien de la soumission
documents_link: Lien des documents documents_link: Lien des documents
sender_name: Nom de l'expéditeur
sender_first_name: Prénom de l'expéditeur
sender_email: Email de l'expéditeur
submitter_name: Nom du signataire
submitter_first_name: Prénom du signataire
submitter_email: Email du signataire
time: time:
formats: formats:
detailed: "%A %d %B %Y %Hh%Mm%Ss" detailed: "%A %d %B %Y %Hh%Mm%Ss"
@ -5218,6 +5242,12 @@ pt: &pt
submission_submitters: Lista de signatários submission_submitters: Lista de signatários
submission_link: Link da submissão submission_link: Link da submissão
documents_link: Link dos documentos documents_link: Link dos documentos
sender_name: Nome do remetente
sender_first_name: Primeiro nome do remetente
sender_email: Email do remetente
submitter_name: Nome do signatário
submitter_first_name: Primeiro nome do signatário
submitter_email: Email do signatário
time: time:
formats: formats:
detailed: "%A, %d de %B de %Y, %H:%M:%Sh" detailed: "%A, %d de %B de %Y, %H:%M:%Sh"
@ -6259,6 +6289,12 @@ de: &de
submission_submitters: Liste der Unterzeichner submission_submitters: Liste der Unterzeichner
submission_link: Link der Einreichung submission_link: Link der Einreichung
documents_link: Link der Dokumente documents_link: Link der Dokumente
sender_name: Name des Absenders
sender_first_name: Vorname des Absenders
sender_email: E-Mail des Absenders
submitter_name: Name des Unterzeichners
submitter_first_name: Vorname des Unterzeichners
submitter_email: E-Mail des Unterzeichners
time: time:
formats: formats:
detailed: "%A, %d. %B %Y, %H:%M:%S Uhr" detailed: "%A, %d. %B %Y, %H:%M:%S Uhr"
@ -7701,6 +7737,12 @@ nl: &nl
submission_submitters: Lijst van ondertekenaars submission_submitters: Lijst van ondertekenaars
submission_link: Link van de inzending submission_link: Link van de inzending
documents_link: Link van de documenten documents_link: Link van de documenten
sender_name: Naam van de afzender
sender_first_name: Voornaam van de afzender
sender_email: E-mail van de afzender
submitter_name: Naam van de ondertekenaar
submitter_first_name: Voornaam van de ondertekenaar
submitter_email: E-mail van de ondertekenaar
time: time:
formats: formats:
detailed: "%d %B %Y %H:%M:%S" detailed: "%d %B %Y %H:%M:%S"

Loading…
Cancel
Save