diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/activity.rhtml | 6 | ||||
| -rw-r--r-- | app/views/timelog/_date_range.rhtml | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index dfc091fd1..efec01f14 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -1,5 +1,5 @@ <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2> -<p class="subtitle"><%= "#{l(:label_date_from)} #{format_date(@date_to - @days)} #{l(:label_date_to).downcase} #{format_date(@date_to-1)}" %></p> +<p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p> <div id="activity"> <% @events_by_day.keys.sort.reverse.each do |day| %> @@ -24,13 +24,13 @@ <%= link_to_remote(('« ' + l(:label_previous)), {:update => "content", :url => params.merge(:from => @date_to - @days - 1), :method => :get, :complete => 'window.scrollTo(0,0)'}, {:href => url_for(params.merge(:from => @date_to - @days - 1)), - :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %> + :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))}) %> </div> <div style="float:right;"> <%= link_to_remote((l(:label_next) + ' »'), {:update => "content", :url => params.merge(:from => @date_to + @days - 1), :method => :get, :complete => 'window.scrollTo(0,0)'}, {:href => url_for(params.merge(:from => @date_to + @days - 1)), - :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %> + :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))}) unless @date_to >= Date.today %> </div> <% other_formats_links do |f| %> diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index ed84b16cf..9b4557e1f 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -8,10 +8,8 @@ <p> <%= radio_button_tag 'period_type', '2', @free_period %> <span onclick="$('period_type_2').checked = true;"> -<%= l(:label_date_from) %> -<%= text_field_tag 'from', @from, :size => 10 %> <%= calendar_for('from') %> -<%= l(:label_date_to) %> -<%= text_field_tag 'to', @to, :size => 10 %> <%= calendar_for('to') %> +<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10) + calendar_for('from')), + :end => (text_field_tag('to', @to, :size => 10) + calendar_for('to'))) %> </span> <%= submit_tag l(:button_apply), :name => nil %> </p> |