IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Change wording for 'regular' categories to 'normal' (#17134)

Browse Source 
At some point in the past we decided to rename the 'regular' notification state of topics/categories to 'normal'. However, some UI copy was missed when the initial renaming was done so this commit changes the spots that were missed to the new name.
This commit is contained in:
Osama Sayegh
2022-06-20 06:49:33 +03:00
committed by GitHub
parent 986060a850
commit 5176c689e9
17 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lib/topic_query_spec.rb
View File

@@ -549,7 +549,7 @@ describe TopicQuery do
end
it 'should include default regular category topics in latest list for anonymous users' do
SiteSetting.default_categories_regular = category.id.to_s
SiteSetting.default_categories_normal = category.id.to_s
expect(TopicQuery.new.list_latest.topics.map(&:id)).to include(topic.id)
end

2
spec/models/category_user_spec.rb
View File

@@ -232,7 +232,7 @@ describe CategoryUser do
SiteSetting.default_categories_watching = category1.id.to_s
SiteSetting.default_categories_tracking = category2.id.to_s
SiteSetting.default_categories_watching_first_post = category3.id.to_s
SiteSetting.default_categories_regular = category4.id.to_s
SiteSetting.default_categories_normal = category4.id.to_s
SiteSetting.default_categories_muted = category5.id.to_s
end
it "every category from the default_categories_* site settings get overridden to regular, except for muted" do

2
spec/models/user_spec.rb
View File

@@ -1727,7 +1727,7 @@ RSpec.describe User do
SiteSetting.default_categories_tracking = category1.id.to_s
SiteSetting.default_categories_muted = category2.id.to_s
SiteSetting.default_categories_watching_first_post = category3.id.to_s
SiteSetting.default_categories_regular = category4.id.to_s
SiteSetting.default_categories_normal = category4.id.to_s
end
it "has overridden preferences" do

2
spec/serializers/site_serializer_spec.rb
View File

@@ -61,7 +61,7 @@ describe SiteSerializer do
it "returns correct notification level for categories" do
SiteSetting.mute_all_categories_by_default = true
SiteSetting.default_categories_regular = category.id.to_s
SiteSetting.default_categories_normal = category.id.to_s
serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
categories = serialized[:categories]