diff --git a/app/mailers/guest_mailer.rb b/app/mailers/guest_mailer.rb
index 96eb525..b9b7575 100644
--- a/app/mailers/guest_mailer.rb
+++ b/app/mailers/guest_mailer.rb
@@ -7,7 +7,7 @@ class GuestMailer < ApplicationMailer
@guest = guest
mail(
to: guest.name_with_email,
- subject: "#{I18n.t(:wedding_name)}: RSVP Confirmation"
+ subject: "#{I18n.t(:wedding_name)}: Zusage/Absage"
)
end
@@ -15,7 +15,7 @@ class GuestMailer < ApplicationMailer
@guest = guest
mail(
to: guest.name_with_email,
- subject: "#{I18n.t(:wedding_name)}: Your RSVP"
+ subject: "#{I18n.t(:wedding_name)}: Deine Zusage/Absage"
)
end
end
diff --git a/app/models/guest.rb b/app/models/guest.rb
index cedc818..fa39122 100644
--- a/app/models/guest.rb
+++ b/app/models/guest.rb
@@ -26,10 +26,10 @@ class Guest < ApplicationRecord
# Don't allow long or odd names in emails; may be spam.
def email_safe_salutation
- return 'Hello,' if
+ return 'Hallo,' if
first_name.blank? || first_name !~ /\A[\p{Word}\s'-]{1,30}\z/i
- "Dear #{first_name},"
+ "Liebe/Lieber #{first_name},"
end
validates :diet, length: { maximum: 8192 }
diff --git a/app/views/application/_mailing_address.html.erb b/app/views/application/_mailing_address.html.erb
index 773a7da..95039ad 100644
--- a/app/views/application/_mailing_address.html.erb
+++ b/app/views/application/_mailing_address.html.erb
@@ -1,3 +1,3 @@
-Alert
-Qikiqtaaluk Region, Nunavut
-Canada
+Knusthöhe 65
+42897 Remscheid
+Deutschland