Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00
Code Packages Activity Actions 11

Replace MultisiteI18n hack with SiteContent and admin editing.

Browse source
This commit is contained in:
Robin Ward 2013-04-05 16:47:20 -04:00
parent 52f79e8096
commit a14f62766e
8 changed files with 16 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/system_message.rb
View file

@ -1,6 +1,5 @@
# Handle sending a message to a user from the system.
require_dependency 'post_creator'
require_dependency 'multisite_i18n'
class SystemMessage
@ -17,18 +16,18 @@ class SystemMessage
defaults = {site_name: SiteSetting.title,
username: @recipient.username,
user_preferences_url: "#{Discourse.base_url}/users/#{@recipient.username_lower}/preferences",
new_user_tips: MultisiteI18n.t("system_messages.usage_tips.text_body_template"),
new_user_tips: SiteContent.content_for(:usage_tips),
site_password: "",
base_url: Discourse.base_url}
params = defaults.merge(params)
if SiteSetting.access_password.present?
params[:site_password] = MultisiteI18n.t('system_messages.site_password', access_password: SiteSetting.access_password)
params[:site_password] = I18n.t('system_messages.site_password', access_password: SiteSetting.access_password)
end
title = MultisiteI18n.t("system_messages.#{type}.subject_template", params)
raw_body = MultisiteI18n.t("system_messages.#{type}.text_body_template", params)
title = I18n.t("system_messages.#{type}.subject_template", params)
raw_body = I18n.t("system_messages.#{type}.text_body_template", params)
PostCreator.create(SystemMessage.system_user,
raw: raw_body,