diff options
| -rw-r--r-- | app/views/activities/index.html.erb | 5 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/ja.yml | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 64f7f6a85..f71266004 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -32,6 +32,10 @@ <% content_for :sidebar do %> <%= form_tag({}, :method => :get, :id => 'activity_scope_form') do %> <h3><%= l(:label_activity) %></h3> +<p> + <%= t(:label_days_to_html, :days => @days, :date => date_field_tag('from', '', :value => (@date_to - 1), :size => 10)) %> + <%= calendar_for('from') %> +</p> <ul> <% @activity.event_types.each do |t| %> <li> @@ -48,7 +52,6 @@ <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p> <% end %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %> -<%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %> <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p> <% end %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0836d2593..c3f4925cd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -945,6 +945,7 @@ en: label_ascending: Ascending label_descending: Descending label_date_from_to: From %{start} to %{end} + label_days_to_html: "%{days} days up to %{date}" label_wiki_content_added: Wiki page added label_wiki_content_updated: Wiki page updated label_group: Group diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 17fd98e80..a972bc005 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -793,6 +793,7 @@ ja: label_ascending: 昇順 label_descending: 降順 label_date_from_to: "%{start}から%{end}まで" + label_days_to_html: "%{date} までの%{days}日間" label_wiki_content_added: Wikiページの追加 label_wiki_content_updated: Wikiページの更新 label_group: グループ |