diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index a70f846..8def278 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -427,7 +427,7 @@ class Admin::AsksController < OrbitAdminController :mail_sentdate=>@mail_sentdate, :module_app=>@module_app, :mail_to=>@group_mail, - :mail_subject=>mail_from+" #{t('ask.reply')}:", + :mail_subject=>(mail_from+" #{t('ask.reply')}:" resuce "#{t('ask.reply')}:"), :template=>'admin/asks/email', :template_data=>{ "host_url" => host_url, diff --git a/app/views/asks/email.html.erb b/app/views/asks/email.html.erb index 0fa2486..31778b6 100644 --- a/app/views/asks/email.html.erb +++ b/app/views/asks/email.html.erb @@ -75,7 +75,7 @@ elsif type == "date" val = val["datetime"].values[0].values rescue [] if val.count == 2 - val = (val[0].to_s.gsub('-', '/') + " ~ " + val[1].to_s.gsub('-', '/') rescue "") + val = val[0].to_s.gsub('-', '/') + " ~ " + val[1].to_s.gsub('-', '/') else val = val[0].to_s.gsub('-', '/') end