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

UX: Stop putting usernames in edit reason when changing post owner

Browse Source
This commit is contained in:
Gerhard Schlager
2018-08-20 12:26:19 +02:00
parent b4f92a05b3
commit 14af90df5b
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/post.rb
View File

@ -546,13 +546,7 @@ class Post < ActiveRecord::Base
def set_owner(new_user, actor, skip_revision = false) def set_owner(new_user, actor, skip_revision = false)
return if user_id == new_user.id return if user_id == new_user.id
edit_reason = I18n.with_locale(SiteSetting.default_locale) do edit_reason = I18n.t('change_owner.post_revision_text', locale: SiteSetting.default_locale)
I18n.t(
'change_owner.post_revision_text',
old_user: self.user&.username_lower || I18n.t('change_owner.deleted_user'),
new_user: new_user.username_lower
)
end
revise( revise(
actor, actor,

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

@ -1868,8 +1868,7 @@ en:
other: "%{count} posts were merged into an existing topic: %{topic_link}" other: "%{count} posts were merged into an existing topic: %{topic_link}"
change_owner: change_owner:
post_revision_text: "Ownership transferred from %{old_user} to %{new_user}" post_revision_text: "Ownership transferred"
deleted_user: "a deleted user"
topic_statuses: topic_statuses:
archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way." archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way."

6
spec/models/post_spec.rb
View File

@ -1077,16 +1077,12 @@ describe Post do
it "uses default locale for edit reason" do it "uses default locale for edit reason" do
I18n.locale = 'de' I18n.locale = 'de'
old_username = post.user.username_lower
post.set_owner(coding_horror, Discourse.system_user) post.set_owner(coding_horror, Discourse.system_user)
post.reload post.reload
expected_reason = I18n.with_locale(SiteSetting.default_locale) do expected_reason = I18n.with_locale(SiteSetting.default_locale) do
I18n.t('change_owner.post_revision_text', I18n.t('change_owner.post_revision_text')
old_user: old_username,
new_user: coding_horror.username_lower
)
end end
expect(post.edit_reason).to eq(expected_reason) expect(post.edit_reason).to eq(expected_reason)