Commit 5abe6ff6 authored by jplang's avatar jplang
Browse files

Adds a lang string with arguments for date ranges (#2305).

git-svn-id: https://svn.redmine.org/redmine/trunk@2587 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent b72cbb8a
<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(('&#171; ' + 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) + ' &#187;'),
{: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>
&nbsp;
<% other_formats_links do |f| %>
......
......@@ -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>
......
......@@ -781,3 +781,4 @@ bg:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -782,3 +782,4 @@ ca:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -786,3 +786,4 @@ cs:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -814,3 +814,4 @@ da:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -813,3 +813,4 @@ de:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -665,6 +665,7 @@ en:
label_sort: Sort
label_ascending: Ascending
label_descending: Descending
label_date_from_to: From {{start}} to {{end}}
button_login: Login
button_submit: Submit
......
......@@ -834,3 +834,4 @@ es:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -824,3 +824,4 @@ fi:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -697,6 +697,7 @@ fr:
label_sort: Tri
label_ascending: Croissant
label_descending: Décroissant
label_date_from_to: Du {{start}} au {{end}}
button_login: Connexion
button_submit: Soumettre
......
......@@ -813,3 +813,4 @@ gl:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -796,3 +796,4 @@ he:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -819,3 +819,4 @@
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -799,3 +799,4 @@ it:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -812,3 +812,4 @@ ja:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -843,3 +843,4 @@ ko:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -824,3 +824,4 @@ lt:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -769,3 +769,4 @@ nl:
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
......@@ -786,3 +786,4 @@
label_descending: Descending
label_sort: Sort
label_ascending: Ascending
label_date_from_to: From {{start}} to {{end}}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment