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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2587 e93f8b46-1217-0410-a6f0-8f06a7374b81

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(('&#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| %>

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>

config/locales/bg.yml

@@ -781,3 +781,4 @@ bg:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/ca.yml

@@ -782,3 +782,4 @@ ca:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/cs.yml

@@ -786,3 +786,4 @@ cs:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/da.yml

@@ -814,3 +814,4 @@ da:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/de.yml

@@ -813,3 +813,4 @@ de:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/en.yml

@@ -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

config/locales/es.yml

@@ -834,3 +834,4 @@ es:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/fi.yml

@@ -824,3 +824,4 @@ fi:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/fr.yml

@@ -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

config/locales/gl.yml

@@ -813,3 +813,4 @@ gl:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/he.yml

@@ -796,3 +796,4 @@ he:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/hu.yml

@@ -819,3 +819,4 @@
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/it.yml

@@ -799,3 +799,4 @@ it:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/ja.yml

@@ -812,3 +812,4 @@ ja:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/ko.yml

@@ -843,3 +843,4 @@ ko:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/lt.yml

@@ -824,3 +824,4 @@ lt:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/nl.yml

@@ -769,3 +769,4 @@ nl:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/no.yml

@@ -786,3 +786,4 @@
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/pl.yml

@@ -817,3 +817,4 @@ pl:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/pt-BR.yml

@@ -819,3 +819,4 @@ pt-BR:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/pt.yml

@@ -805,3 +805,4 @@ pt:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/ro.yml

@@ -826,3 +826,4 @@ ro:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/ru.yml

@@ -912,3 +912,4 @@ ru:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/sk.yml

@@ -785,3 +785,4 @@ sk:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/sl.yml

@@ -783,3 +783,4 @@ sl:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/sr.yml

@@ -807,3 +807,4 @@
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/sv.yml

@@ -841,3 +841,4 @@ sv:
   enumeration_issue_priorities: Ärendeprioriteter
   enumeration_doc_categories: Dokumentkategorier
   enumeration_activities: Aktiviteter (tidsuppföljning)
+  label_date_from_to: From {{start}} to {{end}}

config/locales/th.yml

@@ -784,3 +784,4 @@ th:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/tr.yml

@@ -820,3 +820,4 @@ tr:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/uk.yml

@@ -783,3 +783,4 @@ uk:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/vi.yml

@@ -853,3 +853,4 @@ vi:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}

config/locales/zh-TW.yml

@@ -891,3 +891,4 @@
   enumeration_issue_priorities: 項目優先權
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
+  label_date_from_to: From {{start}} to {{end}}

config/locales/zh.yml

@@ -817,3 +817,4 @@ zh:
   label_descending: Descending
   label_sort: Sort
   label_ascending: Ascending
+  label_date_from_to: From {{start}} to {{end}}