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

FEATURE: support for emoji sets

Browse Source 
Added following emoji sets
  - Apple/International
  - Emoji One (default)
  - Android/Google
  - Twitter

FIX: translations from plugins weren't properly merged with default translations
FEATURE: new 'site_setting_changed' event
This commit is contained in:
Régis Hanol
2014-12-11 17:08:47 +01:00
parent 32b52642ab
commit e6e7948617
4398 changed files with 8376 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/site_setting.rb
View File

@@ -7,6 +7,11 @@ class SiteSetting < ActiveRecord::Base
validates_presence_of :name
validates_presence_of :data_type
after_save do |site_setting|
DiscourseEvent.trigger(:site_setting_saved, site_setting)
true
end
def self.load_settings(file)
SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
if opts.delete(:client)
@@ -19,8 +24,10 @@ class SiteSetting < ActiveRecord::Base
load_settings(File.join(Rails.root, 'config', 'site_settings.yml'))
Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
load_settings(file)
unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
load_settings(file)
end
end
client_settings << :available_locales