Skip to content

Commit 9b2c6f9

Browse files
committed
Change subject of email-notifications
1 parent cd52d5a commit 9b2c6f9

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

app/mailers/assignment_notifier.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ class AssignmentNotifier < ApplicationMailer
77
#
88
def create(assignment)
99
@assignment = assignment
10+
subject = "Zuweisung des Eintrags #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})"
1011

11-
mail to: User.find(assignment.recipient_id).email
12+
mail to: User.find(assignment.recipient_id).email, subject: subject
1213
end
1314

1415
# Subject can be set in your I18n file at config/locales/en.yml
@@ -18,14 +19,16 @@ def create(assignment)
1819
#
1920
def done(assignment)
2021
@assignment = assignment
22+
subject = "Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl}) erledigt"
2123

22-
mail to: User.find(assignment.creator_id).email
24+
mail to: User.find(assignment.creator_id).email, subject: subject
2325
end
2426

2527
def reminder(assignment)
2628
@assignment = assignment
29+
subject = "Überschreitung des Bearbeitungszeitraums für Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})"
2730

28-
mail to: User.find(assignment.recipient_id).email
31+
mail to: User.find(assignment.recipient_id).email, subject: subject
2932
end
3033

3134
# Subject can be set in your I18n file at config/locales/en.yml
@@ -35,8 +38,9 @@ def reminder(assignment)
3538
#
3639
def expired(assignment)
3740
@assignment = assignment
41+
subject = "Rücknahme des Bearbeitungsrechts für Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})"
3842

39-
mail to: User.find(assignment.recipient_id).email
40-
mail cc: User.find(assignment.creator_id).email
43+
mail to: User.find(assignment.recipient_id).email, subject: subject
44+
mail cc: User.find(assignment.creator_id).email, subject: subject
4145
end
4246
end

config/locales/de.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
de:
2-
assignment_notifier:
3-
create:
4-
subject: "Zuweisung eines Eintrags"
5-
done:
6-
subject: "Eine von Dir deligierte Aufgabe wurde erledigt"
7-
reminder:
8-
subject: "Erinnerung"
9-
expired:
10-
subject: "Eine Zuweisung wurde nicht erledigt"
11-
122
date:
133
order:
144
- :month

spec/mailers/assignment_notifier_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
let(:mail) { AssignmentNotifier.create(assignment) }
88

99
it 'renders the headers' do
10-
expect(mail.subject).to eq('Zuweisung eines Eintrags')
10+
expect(mail.subject).to eq("Zuweisung des Eintrags #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})")
1111
expect(mail.to).to eq([assignment.email_of_recipient])
1212
expect(mail.from).to eq([default_sender])
1313
end
@@ -23,7 +23,7 @@
2323
let(:mail) { AssignmentNotifier.done(assignment) }
2424

2525
it 'renders the headers' do
26-
expect(mail.subject).to eq('Eine von Dir deligierte Aufgabe wurde erledigt')
26+
expect(mail.subject).to eq("Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl}) erledigt")
2727
expect(mail.to).to eq([assignment.email_of_creator])
2828
expect(mail.from).to eq([default_sender])
2929
end
@@ -39,7 +39,7 @@
3939
let(:mail) { AssignmentNotifier.reminder(assignment) }
4040

4141
it 'renders the headers' do
42-
expect(mail.subject).to eq('Erinnerung')
42+
expect(mail.subject).to eq("Überschreitung des Bearbeitungszeitraums für Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})")
4343
expect(mail.to).to eq([assignment.email_of_recipient])
4444
expect(mail.from).to eq([default_sender])
4545
end
@@ -55,7 +55,7 @@
5555
let(:mail) { AssignmentNotifier.expired(assignment) }
5656

5757
it 'renders the headers' do
58-
expect(mail.subject).to eq('Eine Zuweisung wurde nicht erledigt')
58+
expect(mail.subject).to eq("Rücknahme des Bearbeitungsrechts für Eintrag #{assignment.entry.japanische_umschrift} (#{assignment.entry.kennzahl})")
5959
expect(mail.to).to eq([assignment.email_of_recipient])
6060
expect(mail.cc).to eq([assignment.email_of_creator])
6161
expect(mail.from).to eq([default_sender])

0 commit comments

Comments
 (0)