summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-14 15:42:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-14 15:42:28 +0000
commit722eaed7216270d8e89f50c92abb1cfaf9bf1503 (patch)
tree17c0bbc3ffe492d4bdb1e2154f158afac46bee43 /app/views
parentfe24da53e7841fdb76651c8fa3abd561fa97cf7f (diff)
downloadredmine-722eaed7216270d8e89f50c92abb1cfaf9bf1503.tar.gz
redmine-722eaed7216270d8e89f50c92abb1cfaf9bf1503.zip
Adds support for custom date format when importing a CSV file (#950).
git-svn-id: http://svn.redmine.org/redmine/trunk@14495 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/imports/settings.html.erb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/imports/settings.html.erb b/app/views/imports/settings.html.erb
index 7afbb84d5..0bc87dd9c 100644
--- a/app/views/imports/settings.html.erb
+++ b/app/views/imports/settings.html.erb
@@ -17,6 +17,10 @@
<label><%= l(:label_encoding) %></label>
<%= select_tag 'import_settings[encoding]', options_for_select(Setting::ENCODINGS, @import.settings['encoding']) %>
</p>
+ <p>
+ <label><%= l(:setting_date_format) %></label>
+ <%= select_tag 'import_settings[date_format]', options_for_select(date_format_options, @import.settings['date_format']) %>
+ </p>
</fieldset>
<p><%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %></p>
<% end %>