diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index b5005a0..b8f18dc 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -120,12 +120,12 @@ class Admin::AsksController < OrbitAdminController mail_from = site['title'][site['default_locale']] email_er.email.update_attributes( - :mail_from=> mail_from, + :mail_lang=> site['default_locale'], :create_user=>current_user, :mail_sentdate=>@mail_sentdate, :module_app=>@module_app, :mail_to=>@group_mail, - :mail_subject=>" #{t('ask.reply')}:", + :mail_subject=>mail_from+" #{t('ask.reply')}:", :template=>'admin/asks/email', :template_data=>{ "reply" => email_er.reply diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb index 7046b17..1c3cf96 100644 --- a/app/controllers/asks_controller.rb +++ b/app/controllers/asks_controller.rb @@ -192,14 +192,14 @@ class AsksController < ActionController::Base site = Site.first mail_from = site['title'][site['default_locale']] - + email_er.email.update_attributes( - :mail_from=> mail_from, + :mail_lang=> site['default_locale'], :create_user=>(current_user rescue nil), :mail_sentdate=>@mail_sentdate, :module_app=>@module_app, :mail_to=>@group_mail, - :mail_subject=>Site.first.title_translations["zh_tw"]+" #{t('ask.new_question')}:", + :mail_subject=>mail_from+" #{t('ask.new_question')}:", :template=>'asks/email', :template_data=>{ # "title" => email_er.title,