From 812c162ea2b0dbd01ac3b309a9454ee948734ad2 Mon Sep 17 00:00:00 2001
From: Sebastian Noe <sebastian.schneider@boxine.de>
Date: Thu, 7 May 2026 17:53:26 +0200
Subject: [PATCH] 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
---
 app/models/account_config.rb                  |  8 ++--
 .../_logo_form.html.erb                       |  2 +-
 .../_markdown_editor.html.erb                 |  2 +-
 config/locales/i18n.yml                       | 42 +++++++++++++++++++
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/app/models/account_config.rb b/app/models/account_config.rb
index 2db37d70..5275afb5 100644
--- a/app/models/account_config.rb
+++ b/app/models/account_config.rb
@@ -62,10 +62,10 @@ class AccountConfig < ApplicationRecord
   ENABLE_MCP_KEY = 'enable_mcp'
 
   EMAIL_VARIABLES = {
-    SUBMITTER_INVITATION_EMAIL_KEY => %w[template.name submitter.link account.name].freeze,
-    SUBMITTER_COMPLETED_EMAIL_KEY => %w[template.name submission.submitters submission.link].freeze,
-    SUBMITTER_INVITATION_REMINDER_EMAIL_KEY => %w[template.name submitter.link account.name].freeze,
-    SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => %w[template.name documents.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 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 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 sender.name sender.first_name sender.email submitter.name submitter.first_name submitter.email].freeze
   }.freeze
 
   DEFAULT_VALUES = {
diff --git a/app/views/personalization_settings/_logo_form.html.erb b/app/views/personalization_settings/_logo_form.html.erb
index 9a84b78b..3cbca675 100644
--- a/app/views/personalization_settings/_logo_form.html.erb
+++ b/app/views/personalization_settings/_logo_form.html.erb
@@ -29,6 +29,6 @@
     </label>
   </file-dropzone>
   <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>
 <% end %>
diff --git a/app/views/personalization_settings/_markdown_editor.html.erb b/app/views/personalization_settings/_markdown_editor.html.erb
index 5e43e5cb..569dd880 100644
--- a/app/views/personalization_settings/_markdown_editor.html.erb
+++ b/app/views/personalization_settings/_markdown_editor.html.erb
@@ -53,7 +53,7 @@
           </div>
         </div>
         <% 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">
             <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') %>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index a2839022..02a462cc 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -1056,6 +1056,12 @@ en: &en
     submission_submitters: Submitters list
     submission_link: Submission 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:
     formats:
       detailed: "%B %d, %Y %H:%M:%S"
@@ -2097,6 +2103,12 @@ es: &es
     submission_submitters: Lista de firmantes
     submission_link: Enlace del envío
     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:
     formats:
       detailed: "%-d de %B de %Y %H:%M:%S"
@@ -3139,6 +3151,12 @@ it: &it
     submission_submitters: Lista dei firmatari
     submission_link: Link dell'invio
     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:
     formats:
       detailed: "%d %B %Y %H:%M:%S"
@@ -4177,6 +4195,12 @@ fr: &fr
     submission_submitters: Liste des signataires
     submission_link: Lien de la soumission
     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:
     formats:
       detailed: "%A %d %B %Y %Hh%Mm%Ss"
@@ -5218,6 +5242,12 @@ pt: &pt
     submission_submitters: Lista de signatários
     submission_link: Link da submissão
     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:
     formats:
       detailed: "%A, %d de %B de %Y, %H:%M:%Sh"
@@ -6259,6 +6289,12 @@ de: &de
     submission_submitters: Liste der Unterzeichner
     submission_link: Link der Einreichung
     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:
     formats:
       detailed: "%A, %d. %B %Y, %H:%M:%S Uhr"
@@ -7701,6 +7737,12 @@ nl: &nl
     submission_submitters: Lijst van ondertekenaars
     submission_link: Link van de inzending
     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:
     formats:
       detailed: "%d %B %Y %H:%M:%S"