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

app/views/mailer/issue_add.text.html.rhtml

@@ -1,3 +1,3 @@
-<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
 <hr />
 <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_add.text.plain.rhtml

@@ -1,4 +1,4 @@
-<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
 
 ----------------------------------------
 <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_edit.text.html.rhtml

@@ -1,4 +1,4 @@
-<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
 
 <ul>
 <% for detail in @journal.details %>

app/views/mailer/issue_edit.text.plain.rhtml

@@ -1,4 +1,4 @@
-<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
 
 <% for detail in @journal.details -%>
 <%= show_detail(detail, true) %>

app/views/mailer/reminder.text.html.rhtml

@@ -1,4 +1,4 @@
-<p><%= l(:mail_body_reminder, @issues.size, @days) %></p>
+<p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
 
 <ul>
 <% @issues.each do |issue| -%>

app/views/mailer/reminder.text.plain.rhtml

@@ -1,4 +1,4 @@
-<%= l(:mail_body_reminder, @issues.size, @days) %>:
+<%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
 
 <% @issues.each do |issue| -%>
 * <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>