mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-29 19:59:38 +00:00
Fix hard-coded string "no subject" in app/models/mail_handler.rb (#5820).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@18388 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8913da8aab
commit
959b55779f
@ -199,7 +199,7 @@ class MailHandler < ActionMailer::Base
|
||||
issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
|
||||
issue.subject = cleaned_up_subject
|
||||
if issue.subject.blank?
|
||||
issue.subject = '(no subject)'
|
||||
issue.subject = "(#{ll(Setting.default_language, :text_no_subject)})"
|
||||
end
|
||||
issue.description = cleaned_up_text_body
|
||||
issue.start_date ||= User.current.today if Setting.default_issue_start_date_to_creation_date?
|
||||
|
||||
@ -1218,6 +1218,7 @@ en:
|
||||
text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
|
||||
text_select_apply_tracker: "Select tracker"
|
||||
text_avatar_server_config_html: The current avatar server is <a href="%{url}">%{url}</a>. You can configure it in config/configuration.yml.
|
||||
text_no_subject: no subject
|
||||
|
||||
|
||||
default_role_manager: Manager
|
||||
|
||||
@ -738,12 +738,14 @@ class MailHandlerTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
def test_add_issue_with_no_subject_header
|
||||
issue = submit_email(
|
||||
'no_subject_header.eml',
|
||||
:issue => {:project => 'ecookbook'}
|
||||
)
|
||||
assert_kind_of Issue, issue
|
||||
assert_equal '(no subject)', issue.subject
|
||||
with_settings :default_language => 'en' do
|
||||
issue = submit_email(
|
||||
'no_subject_header.eml',
|
||||
:issue => {:project => 'ecookbook'}
|
||||
)
|
||||
assert_kind_of Issue, issue
|
||||
assert_equal "(no subject)", issue.subject
|
||||
end
|
||||
end
|
||||
|
||||
def test_add_issue_with_mixed_japanese_subject
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user