diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1d9f6b10f5..99db332f41 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2103,7 +2103,7 @@ en:
text_work_packages_ref_in_commit_messages: "Referencing and fixing work packages in commit messages"
text_journal_added: "%{label} %{value} added"
text_journal_aggregation_time_explanation: "Combine journals for display if their age difference is less than the specified timespan. This will also delay mail notifications by the same amount of time."
- text_journal_changed: "%{label} changed from %{old} to %{new}"
+ text_journal_changed: "%{label} changed from %{old} to %{new}"
text_journal_changed_no_detail: "%{label} updated"
text_journal_changed_with_diff: "%{label} changed (%{link})"
text_journal_deleted: "%{label} deleted (%{old})"
diff --git a/lib/plugins/acts_as_journalized/lib/journal_formatter/base.rb b/lib/plugins/acts_as_journalized/lib/journal_formatter/base.rb
index aa2f4c72bf..a777b6afae 100644
--- a/lib/plugins/acts_as_journalized/lib/journal_formatter/base.rb
+++ b/lib/plugins/acts_as_journalized/lib/journal_formatter/base.rb
@@ -80,7 +80,7 @@ class JournalFormatter::Base
if old_value.blank?
l(:text_journal_set_to, label: label, value: value)
else
- l(:text_journal_changed, label: label, old: old_value, new: value)
+ l(:text_journal_changed, label: label, old: old_value, new: value).html_safe
end
end
end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 7eade985e1..a383ebd35e 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -226,7 +226,7 @@ describe UserMailer, type: :mailer do
end
it 'displays changed done ratio' do
- is_expected.to include('Progress (%) changed from 40 to 100')
+ is_expected.to include('Progress (%) changed from 40 to 100')
end
end
@@ -236,7 +236,7 @@ describe UserMailer, type: :mailer do
end
it 'displays new done ratio' do
- is_expected.to include('Progress (%) changed from 0 to 100')
+ is_expected.to include('Progress (%) changed from 0 to 100')
end
end
@@ -246,7 +246,7 @@ describe UserMailer, type: :mailer do
end
it 'displays deleted done ratio' do
- is_expected.to include('Progress (%) changed from 50 to 0')
+ is_expected.to include('Progress (%) changed from 50 to 0')
end
end
end
@@ -494,7 +494,7 @@ describe UserMailer, type: :mailer do
end
context 'changed done ratio' do
- let(:expected) { "#{expected_prefix} changed from 40 to 100" }
+ let(:expected) { "#{expected_prefix} changed from 40 to 100" }
before do
allow(journal).to receive(:details).and_return('done_ratio' => [40, 100])
@@ -506,7 +506,7 @@ describe UserMailer, type: :mailer do
end
context 'new done ratio' do
- let(:expected) { "#{expected_prefix} changed from 0 to 100" }
+ let(:expected) { "#{expected_prefix} changed from 0 to 100" }
before do
allow(journal).to receive(:details).and_return('done_ratio' => [nil, 100])
@@ -518,7 +518,7 @@ describe UserMailer, type: :mailer do
end
context 'deleted done ratio' do
- let(:expected) { "#{expected_prefix} changed from 50 to 0" }
+ let(:expected) { "#{expected_prefix} changed from 50 to 0" }
before do
allow(journal).to receive(:details).and_return('done_ratio' => [50, nil])
diff --git a/spec_legacy/unit/repository_spec.rb b/spec_legacy/unit/repository_spec.rb
index 8521acdfad..c2ef530725 100644
--- a/spec_legacy/unit/repository_spec.rb
+++ b/spec_legacy/unit/repository_spec.rb
@@ -108,7 +108,7 @@ describe Repository, type: :model do
mail = ActionMailer::Base.deliveries.first
assert_kind_of Mail::Message, mail
assert mail.subject.starts_with?("[#{fixed_work_package.project.name} - #{fixed_work_package.type.name} ##{fixed_work_package.id}]")
- assert mail.body.encoded.include?("Status changed from #{old_status} to #{fixed_work_package.status}")
+ assert mail.body.encoded.include?("Status changed from #{old_status} to #{fixed_work_package.status}")
# ignoring commits referencing an issue of another project
assert_equal [], WorkPackage.find(4).changesets