diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-16 20:26:36 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-11-16 20:26:36 +0000 |
| commit | e4ce95c3a18496e8bc20787331d8f11c6b6b6e25 (patch) | |
| tree | bf0895012fc2058c0b583c69295af8da76534f46 /app/views | |
| parent | 4951676172b2545f409c0ff677c873338bc80be5 (diff) | |
| download | redmine-e4ce95c3a18496e8bc20787331d8f11c6b6b6e25.tar.gz redmine-e4ce95c3a18496e8bc20787331d8f11c6b6b6e25.zip | |
Added a couple of new formats for the 'date format' setting.
Added a 'time format' setting.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@905 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/activity.rhtml | 2 | ||||
| -rw-r--r-- | app/views/settings/edit.rhtml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index cc54eac95..c902d60a3 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -4,7 +4,7 @@ <h3><%= day_name(day.cwday) %> <%= day.day %></h3> <ul> <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| %> - <li><p><%= e.event_datetime.strftime("%H:%M") %> <%= link_to truncate(e.event_title, 100), e.event_url %><br /> + <li><p><%= format_time(e.event_datetime, false) %> <%= link_to truncate(e.event_title, 100), e.event_url %><br /> <% unless e.event_description.blank? %><em><%= truncate(e.event_description, 500) %></em><br /><% end %> <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></p></li> <% end %> diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index b08b707bf..62aa7974c 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -20,7 +20,10 @@ <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p> <p><label><%= l(:setting_date_format) %></label> -<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '0'], ['ISO 8601 (YYYY-MM-DD)', '1']], Setting.date_format) %></p> +<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p> + +<p><label><%= l(:setting_time_format) %></label> +<%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p> <p><label><%= l(:setting_attachment_max_size) %></label> <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p> |