| @@ -235,8 +235,8 class MailHandler < ActionMailer::Base | |||||
| 235 | def extract_keyword!(text, attr, format=nil) |
|
235 | def extract_keyword!(text, attr, format=nil) | |
| 236 | keys = [attr.to_s.humanize] |
|
236 | keys = [attr.to_s.humanize] | |
| 237 | if attr.is_a?(Symbol) |
|
237 | if attr.is_a?(Symbol) | |
| 238 | keys << l("field_#{attr}", :default => '', :locale => user.language) if user |
|
238 | keys << l("field_#{attr}", :default => '', :locale => user.language) if user && user.language.present? | |
| 239 | keys << l("field_#{attr}", :default => '', :locale => Setting.default_language) |
|
239 | keys << l("field_#{attr}", :default => '', :locale => Setting.default_language) if Setting.default_language.present? | |
| 240 | end |
|
240 | end | |
| 241 | keys.reject! {|k| k.blank?} |
|
241 | keys.reject! {|k| k.blank?} | |
| 242 | keys.collect! {|k| Regexp.escape(k)} |
|
242 | keys.collect! {|k| Regexp.escape(k)} | |
General Comments 0
You need to be logged in to leave comments.
Login now