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

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index dfc091fd1f7444cf67ab6e73984c11fd9eb13c5b..efec01f14562ecce5ae7b7e10965dd10c611b10f 100644 (file)
--- 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(('&#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| %>

diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
index ed84b16cf55cc4fb6f17bdfaa81bd7f9305a6c69..9b4557e1fd2c5354dba944f4b813a6f538a48998 100644 (file)
--- 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>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 0179cb26160f3aeea7bf62a01bc1ece1d88a9d3f..bc69a97f1d33dc38b7e1534293f0b39bc58b2913 100644 (file)
--- a/config/locales/bg.yml
+++ b/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}}

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e62a936d6f5e4173a3aa6856050a9e9d09865c7f..6c0381c1f39a8bc022f3c929cfef10938780bbb9 100644 (file)
--- a/config/locales/ca.yml
+++ b/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}}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 577758532e8e723c3bbd9eb252eab0ec897e7743..d8db54c7c70fd9508c0cedd474d06a5d78ef8ace 100644 (file)
--- a/config/locales/cs.yml
+++ b/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}}

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 76323520f0ff0416ecfd026c5f0c46d0ad8bf8cf..ca1d9fa242bee9561f15a87aa488e4e7134faa1d 100644 (file)
--- a/config/locales/da.yml
+++ b/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}}

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 95a6f6c38c665a93a2a1d653f59acb784509e587..7acff5118e4dd36b6cb2bc4702c4983381ab970f 100644 (file)
--- a/config/locales/de.yml
+++ b/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}}

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e0cce3cbea8c6edb2d655b2bec4898e780bc85fb..b051b4682dd6a8113ed014a3d7c7ddb142039d6a 100644 (file)
--- a/config/locales/en.yml
+++ b/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

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 259d29489e5c1baaa9425d2a806045d1532974d8..d249e9b05676db7fb00d5ff6ff97fe341669f524 100644 (file)
--- a/config/locales/es.yml
+++ b/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}}

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1ae6bc75c15b35fe1c2a315686435a907caf95d9..50682174b19afe95dc438a125c8c3607904399cb 100644 (file)
--- a/config/locales/fi.yml
+++ b/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}}

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 72a1023a0a8d31b8c19a4400c511e4110005f923..d0c77bdfa93c8f50d36cb50aee935b5dcb190e48 100644 (file)
--- a/config/locales/fr.yml
+++ b/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

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 65f37de853bd0457c8d1936daa3ae08a745a00ad..6cc9127c575c4d1ae1a27ee83c4470a793e89891 100644 (file)
--- a/config/locales/gl.yml
+++ b/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}}

diff --git a/config/locales/he.yml b/config/locales/he.yml
index e674cc16063ec7c6e697a3d4a87652e34743ead2..805612571b35ddf88c6dd9913449333755d8b923 100644 (file)
--- a/config/locales/he.yml
+++ b/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}}

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7a82ed57ff776524b35dcdb562ff3f9482e5d360..2a43079d4471a4c50aae6b10aa14b7b736a60dfa 100644 (file)
--- a/config/locales/hu.yml
+++ b/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}}

diff --git a/config/locales/it.yml b/config/locales/it.yml
index d10084ce2d6ded487c890aa2cb312f8f2bdb7777..6da3a95aa8ecbd4945a837390240f91fdfa27db5 100644 (file)
--- a/config/locales/it.yml
+++ b/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}}

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c82074b0f8f2cce6727cfa4a6619c5056a3fd38f..ff64a413c0e84d6edeb26effa6b0392d7d93a657 100644 (file)
--- a/config/locales/ja.yml
+++ b/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}}

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 30d04324fa5648db82004668e543be61f1ae4ef4..f1a5d7e8e69524720d104f325064f6aa27d4c0cd 100644 (file)
--- a/config/locales/ko.yml
+++ b/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}}

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index a8bea412f391b55aa1c3dd51a78f9a88b716f0f6..4da7f13fc191574e8daff9eb719b368d99ca8de5 100644 (file)
--- a/config/locales/lt.yml
+++ b/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}}

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 89e9b8346119d48508bae0ea2f30a2b0162e2774..9572d84471e3f5e7b90c63d43bee5888ec19405c 100644 (file)
--- a/config/locales/nl.yml
+++ b/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}}

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 1b670ad6e1d44b8f77ef30f264050b60412f490e..61452f4a5ad37a5a2c37adb49dc810fe34f57b7b 100644 (file)
--- a/config/locales/no.yml
+++ b/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}}

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8eb6eb940a0ae48347224dad207c2afa9be14d83..15e51005372272ba8c234425b8bb07045070ea15 100644 (file)
--- a/config/locales/pl.yml
+++ b/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}}

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index ca9525d8f938f1bb08e0c6820bc113f4180ebf55..6c663693ef0f8addad39abb83f333ba0c4446912 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/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}}

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index fb44479780a65195ac0eb1e0e9f1b8bd6fbe7bae..510f517a95a3f1f47e536b79c6710a4f78105049 100644 (file)
--- a/config/locales/pt.yml
+++ b/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}}

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 30fbc3a940f63c13f857c297598511b95ba1d09f..629dcb075c10dd27de2eb93ffc00948c672881a2 100644 (file)
--- a/config/locales/ro.yml
+++ b/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}}

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index fcb62b35e8e1054a4ccb6e52fee61ab31b9d88ab..c3a3cb3d723bf129ba186318af63e72bce268a67 100644 (file)
--- a/config/locales/ru.yml
+++ b/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}}

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index fb75161f1656998994cc4beeab594c1f95373741..b729fea8bf9b8add82a77573baa7c282943e759e 100644 (file)
--- a/config/locales/sk.yml
+++ b/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}}

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 249e47fbb9133afa5df58cacde75306980310381..e949ce39e760ef1d19ac489e483c3574e31c9aa3 100644 (file)
--- a/config/locales/sl.yml
+++ b/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}}

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index a4b66a0589163353b9ffec6e3f326891f4317895..5ac1dba0402e66c5137d4f96abcbc13adf3bbc78 100644 (file)
--- a/config/locales/sr.yml
+++ b/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}}

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index dcd274c56c572dfba69acf2addadc98512cb3850..f2136feec2cea04b8115aa6d785c65a64f235862 100644 (file)
--- a/config/locales/sv.yml
+++ b/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}}

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 147c59bfcfc8f6b78c20973882ff8d43cd435e71..692a9059bde3566edb0f731abc1c954142eaccd2 100644 (file)
--- a/config/locales/th.yml
+++ b/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}}

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index de46119407caf112a3ad2dd6c55f16ca26f31c73..a4298304d15e6e6111227d75c528b8fd53ecddf0 100644 (file)
--- a/config/locales/tr.yml
+++ b/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}}

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4eda5113648e98aee5abf4a3467e25ff4d75799e..724afe2060d1e9551985e0f3cc4c56eebbcb6109 100644 (file)
--- a/config/locales/uk.yml
+++ b/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}}

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index decba375ff21c884cee43cecec0f380711a7a16e..1bf0a8f5cf770668db4fc8b498bd0c914c9f1638 100644 (file)
--- a/config/locales/vi.yml
+++ b/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}}

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 082ddcbdb5ea4fe30292905ce27db544de727e15..a7b7b2d17ed4ac31e1406c1c130b93bc5d9714b4 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/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}}

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index e6fe11404c84367d05a72908c2738ee48d7df7e8..b25227f4d204ff7111c9792f7fe151d27ce97feb 100644 (file)
--- a/config/locales/zh.yml
+++ b/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}}