meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 09:21:12 +00:00
Code Issues Releases Wiki Activity

Set default date format based on user locale (#950).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14496 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-08-14 15:52:04 +00:00
parent 722eaed721
commit 67ea285dea
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/import.rb
View File

@ -59,10 +59,14 @@ class Import < ActiveRecord::Base
wrapper = '"'
encoding = lu(user, :general_csv_encoding)
date_format = lu(user, "date.formats.default", :default => "foo")
date_format = DATE_FORMATS.first unless DATE_FORMATS.include?(date_format)
self.settings.merge!(
'separator' => separator,
'wrapper' => wrapper,
'encoding' => encoding
'encoding' => encoding,
'date_format' => date_format
)
end

10
test/unit/issue_import_test.rb
View File

@ -92,6 +92,16 @@ class IssueImportTest < ActiveSupport::TestCase
assert_equal '2015-07-14', issue.custom_field_value(field)
end
def test_date_format_should_default_to_user_language
user = User.generate!(:language => 'fr')
import = Import.new
import.user = user
assert_nil import.settings['date_format']
import.set_default_settings
assert_equal '%d/%m/%Y', import.settings['date_format']
end
def test_run_should_remove_the_file
import = generate_import_with_mapping
file_path = import.filepath