Browse Source

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
tags/4.1.0
Go MAEDA 4 years ago
parent
commit
959b55779f
3 changed files with 10 additions and 7 deletions
  1. 1
    1
      app/models/mail_handler.rb
  2. 1
    0
      config/locales/en.yml
  3. 8
    6
      test/unit/mail_handler_test.rb

+ 1
- 1
app/models/mail_handler.rb View File

@@ -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?

+ 1
- 0
config/locales/en.yml View File

@@ -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

+ 8
- 6
test/unit/mail_handler_test.rb View File

@@ -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…
Cancel
Save