From e5c0efd9a4e34b13a8cd4067a872a0ad3b331f12 Mon Sep 17 00:00:00 2001 From: drummer83 Date: Fri, 19 Jan 2024 03:10:53 +0100 Subject: [PATCH] Add new partial to producer_mailer and re-organize used translation keys Remaining translation keys for emails will be re-organized in a separate commit --- .../producer_mailer/order_cycle_report.html.haml | 14 +++++++++++--- config/locales/en.yml | 7 ++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/views/producer_mailer/order_cycle_report.html.haml b/app/views/producer_mailer/order_cycle_report.html.haml index 4b85b9ce44..e1abadf849 100644 --- a/app/views/producer_mailer/order_cycle_report.html.haml +++ b/app/views/producer_mailer/order_cycle_report.html.haml @@ -1,6 +1,14 @@ -%p - = t :producer_mail_greeting - #{" " + @producer.name}, +- if @coordinator.logo.variable? + - @enterprise_for_logo = @coordinator + +- greeting_key = "mailers_shared.enterprise_greeting" +- intro_key = ".intro_html" + += render partial: 'shared/mailers/greeting_and_intro', + locals: { greeting: t(greeting_key, name: @producer.contact_name), + intro: t(intro_key, producer: @producer.name), + enterprise_for_logo: @enterprise_for_logo } + %p = t :producer_mail_text_before %ul diff --git a/config/locales/en.yml b/config/locales/en.yml index 49c5eb08f3..2d743b19f6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -395,9 +395,9 @@ en: intro_html: "A payment for order %{order_number} at %{distributor} requires additional authorization from the customer." instructions: "The customer has been notified via email and the payment will appear as pending until it is authorized." producer_mailer: - order_cycle: + order_cycle_report: subject: "Order cycle report for %{producer}" - provider_settings: "Provider settings" + intro_html: "An order cycle report is ready for %{producer}." report_mailer: report_ready: subject: "Report ready" @@ -448,6 +448,8 @@ en: title: Other Failure (%{count} orders) explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this. + provider_settings: "Provider settings" + home: "OFN" title: "Open Food Network" welcome_to: "Welcome to" @@ -2478,7 +2480,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using set_a_password: "You will then be prompted to set a password before you are able to administer the enterprise." mistakenly_sent: "Not sure why you have received this email? Please contact %{owner_email} for more information." - producer_mail_greeting: "Dear" producer_mail_text_before: "Please find below an update about the order cycle ready for:" producer_mail_order_text: "Here is a summary of the orders for your products:" producer_mail_delivery_instructions: "Stock pickup/delivery instructions:"