mirror of
https://github.com/discourse/discourse.git
synced 2025-03-23 18:19:24 +08:00
FIX: System message wasn't fully translatable
This commit is contained in:
parent
02f0637892
commit
31c1d57228
@ -841,10 +841,9 @@ class Group < ActiveRecord::Base
|
||||
def notify_added_to_group(user, owner: false)
|
||||
SystemMessage.create_from_system_user(
|
||||
user,
|
||||
:user_added_to_group,
|
||||
owner ? :user_added_to_group_as_owner : :user_added_to_group_as_member,
|
||||
group_name: self.full_name.presence || self.name,
|
||||
group_path: "/g/#{self.name}",
|
||||
membership_level: owner ? "an owner" : "a member"
|
||||
group_path: "/g/#{self.name}"
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -2909,11 +2909,17 @@ en:
|
||||
``` text
|
||||
%{logs}
|
||||
```
|
||||
user_added_to_group:
|
||||
title: "Added to Group"
|
||||
subject_template: "You have been added as %{membership_level} of the %{group_name} group"
|
||||
user_added_to_group_as_owner:
|
||||
title: "Added to Group as Owner"
|
||||
subject_template: "You have been added as an owner of the %{group_name} group"
|
||||
text_body_template: |
|
||||
You have been added as a %{membership_level} of the [%{group_name}](%{base_url}%{group_path}) group.
|
||||
You have been added as an owner of the [%{group_name}](%{base_url}%{group_path}) group.
|
||||
|
||||
user_added_to_group_as_member:
|
||||
title: "Added to Group as Member"
|
||||
subject_template: "You have been added as a member of the %{group_name} group"
|
||||
text_body_template: |
|
||||
You have been added as a member of the [%{group_name}](%{base_url}%{group_path}) group.
|
||||
|
||||
csv_export_succeeded:
|
||||
title: "CSV Export Succeeded"
|
||||
|
@ -131,7 +131,10 @@ RSpec.describe Admin::GroupsController do
|
||||
}
|
||||
expect(response.status).to eq(200)
|
||||
|
||||
topic = Topic.find_by(title: "You have been added as an owner of the #{group.name} group", archetype: "private_message")
|
||||
topic = Topic.find_by(
|
||||
title: I18n.t("system_messages.user_added_to_group_as_owner.subject_template", group_name: group.name),
|
||||
archetype: "private_message"
|
||||
)
|
||||
expect(topic.nil?).to eq(true)
|
||||
end
|
||||
|
||||
@ -144,7 +147,10 @@ RSpec.describe Admin::GroupsController do
|
||||
}
|
||||
expect(response.status).to eq(200)
|
||||
|
||||
topic = Topic.find_by(title: "You have been added as an owner of the #{group.name} group", archetype: "private_message")
|
||||
topic = Topic.find_by(
|
||||
title: I18n.t("system_messages.user_added_to_group_as_owner.subject_template", group_name: group.name),
|
||||
archetype: "private_message"
|
||||
)
|
||||
expect(topic.nil?).to eq(false)
|
||||
expect(topic.topic_users.map(&:user_id)).to include(-1, user.id)
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user