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

Revert "FEATURE: Site settings defaults per locale"

Browse Source 
This reverts commit 468a8fcd206d14ff4421758e840d63a27c246254.
This commit is contained in:
Guo Xiang Tan
2017-08-07 10:31:50 +09:00
parent 4b53fe3cc7
commit 439fe8ba24
28 changed files with 364 additions and 1373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/rails_helper.rb
View File

@ -80,8 +80,8 @@ Spork.prefork do
# and pretend they are default.
# There are a bunch of settings that are seeded, they must be loaded as defaults
SiteSetting.current.each do |k, v|
# skip setting defaults for settings that are in unloaded plugins
SiteSetting.defaults.set_regardless_of_locale(k, v) if SiteSetting.respond_to? k
# skip setting defauls for settings that are in unloaded plugins
SiteSetting.defaults[k] = v if SiteSetting.respond_to? k
end
require_dependency 'site_settings/local_process_provider'
@ -119,7 +119,6 @@ Spork.prefork do
SiteSetting.provider.all.each do |setting|
SiteSetting.remove_override!(setting.name)
end
SiteSetting.defaults.site_locale = SiteSettings::DefaultsProvider::DEFAULT_LOCALE
# very expensive IO operations
SiteSetting.automatically_download_gravatars = false