Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed unused `type` parameter in site settings. Remove hardcoded date reference in en.yml

This commit is contained in:
Robin Ward 2013-03-01 17:27:59 -05:00
parent 9a2588c46d
commit d78a2b2b91
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -706,7 +706,7 @@ en:
subject_template: "[%{site_name}] Forum Activity for %{date}" subject_template: "[%{site_name}] Forum Activity for %{date}"
new_activity: "New activity on your topics and posts:" new_activity: "New activity on your topics and posts:"
new_topics: "New topics:" new_topics: "New topics:"
unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you for 7 days.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}." unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}."
private_message: private_message:
subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}" subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"

4
lib/site_setting_extension.rb
View File

@ -19,7 +19,7 @@ module SiteSettingExtension
@defaults ||= {} @defaults ||= {}
end end
def setting(name, default = nil, type = nil) def setting(name, default = nil)
mutex.synchronize do mutex.synchronize do
self.defaults[name] = default self.defaults[name] = default
current_value = current.has_key?(name) ? current[name] : default current_value = current.has_key?(name) ? current[name] : default
@ -28,7 +28,7 @@ module SiteSettingExtension
end end
# just like a setting, except that it is available in javascript via DiscourseSession # just like a setting, except that it is available in javascript via DiscourseSession
def client_setting(name, default = nil, type = nil) def client_setting(name, default = nil)
setting(name,default,type) setting(name,default,type)
@@client_settings ||= [] @@client_settings ||= []
@@client_settings << name @@client_settings << name