diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
| commit | fe28193e4eb9af2dc5262535a29ffde5249568fc (patch) | |
| tree | bd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /app/views/timelog | |
| parent | 9a986ac0a51fe844eee816325e6a6d4122136d9a (diff) | |
| download | redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip | |
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/timelog/details.rhtml | 2 | ||||
| -rw-r--r-- | app/views/timelog/report.rhtml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml index 1144d42cc..019eda2ec 100644 --- a/app/views/timelog/_list.rhtml +++ b/app/views/timelog/_list.rhtml @@ -20,7 +20,7 @@ <td class="project"><%=h entry.project %></td> <td class="subject"> <% if entry.issue -%> -<%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%> +<%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, :length => 50)) -%> <% end -%> </td> <td class="comments"><%=h entry.comments %></td> diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index f4ae68aa9..950b37dc1 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -15,7 +15,7 @@ already in the URI %> <% end %>
<div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
</div>
<% unless @entries.empty? %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml index 5f3ed09bd..6ff61ff75 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/timelog/report.rhtml @@ -20,7 +20,7 @@ [l(:label_day_plural).titleize, 'day']], @columns), :onchange => "this.form.onsubmit();" %> - <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), + <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}), :onchange => "this.form.onsubmit();", :style => 'width: 200px', :id => nil, @@ -33,7 +33,7 @@ <% unless @criterias.empty? %> <div class="total-hours"> -<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p> +<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p> </div> <% unless @hours.empty? %> @@ -41,7 +41,7 @@ <thead> <tr> <% @criterias.each do |criteria| %> - <th><%= l(@available_criterias[criteria][:label]) %></th> + <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th> <% end %> <% columns_width = (40 / (@periods.length+1)).to_i %> <% @periods.each do |period| %> |