github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-10 03:20:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: System message wasn't fully translatable

Browse Source
This commit is contained in:
Gerhard Schlager 2020-09-02 15:24:01 +02:00
parent 02f0637892
commit 31c1d57228
No known key found for this signature in database
GPG Key ID: 943644A1A201E402
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/group.rb
View File

@ -841,10 +841,9 @@ class Group < ActiveRecord::Base
def notify_added_to_group(user, owner: false) def notify_added_to_group(user, owner: false)
SystemMessage.create_from_system_user( SystemMessage.create_from_system_user(
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_name: self.full_name.presence || self.name,
group_path: "/g/#{self.name}", group_path: "/g/#{self.name}"
membership_level: owner ? "an owner" : "a member"
) )
end end

14
config/locales/server.en.yml
View File

@ -2909,11 +2909,17 @@ en:
``` text ``` text
%{logs} %{logs}
``` ```
user_added_to_group: user_added_to_group_as_owner:
title: "Added to Group" title: "Added to Group as Owner"
subject_template: "You have been added as %{membership_level} of the %{group_name} group" subject_template: "You have been added as an owner of the %{group_name} group"
text_body_template: | 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: csv_export_succeeded:
title: "CSV Export Succeeded" title: "CSV Export Succeeded"

10
spec/requests/admin/groups_controller_spec.rb
View File

@ -131,7 +131,10 @@ RSpec.describe Admin::GroupsController do
} }
expect(response.status).to eq(200) 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) expect(topic.nil?).to eq(true)
end end
@ -144,7 +147,10 @@ RSpec.describe Admin::GroupsController do
} }
expect(response.status).to eq(200) 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.nil?).to eq(false)
expect(topic.topic_users.map(&:user_id)).to include(-1, user.id) expect(topic.topic_users.map(&:user_id)).to include(-1, user.id)
end end