Redmine 4.1.1

app/views/mailer/_issue.html.erb

@@ -1,6 +1,6 @@
 <h1><%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %></h1>
 
-<%= render_email_issue_attributes(issue, users.first, true) %>
+<%= render_email_issue_attributes(issue, user, true) %>
 
 <%= textilizable(issue, :description, :only_path => false) %>
 

app/views/mailer/_issue.text.erb

@@ -1,7 +1,7 @@
 <%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
 <%= issue_url %>
 
-<%= render_email_issue_attributes(issue, users.first) %>
+<%= render_email_issue_attributes(issue, user) %>
 ----------------------------------------
 <%= issue.description %>
 

app/views/mailer/account_activation_request.html.erb

@@ -1,2 +1,2 @@
-<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
+<p><%= l(:mail_body_account_activation_request, h(@new_user.login)) %></p>
 <p><%= link_to @url, @url %></p>

app/views/mailer/account_activation_request.text.erb

@@ -1,2 +1,2 @@
-<%= l(:mail_body_account_activation_request, @user.login) %>
+<%= l(:mail_body_account_activation_request, @new_user.login) %>
 <%= @url %>

app/views/mailer/issue_add.html.erb

@@ -1,3 +1,3 @@
 <%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
 <hr />
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>

app/views/mailer/issue_add.text.erb

@@ -1,4 +1,4 @@
 <%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
 
 ----------------------------------------
-<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>

app/views/mailer/issue_edit.html.erb

@@ -12,4 +12,4 @@
 
 <%= textilizable(@journal, :notes, :only_path => false) %>
 <hr />
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>

app/views/mailer/issue_edit.text.erb

@@ -9,4 +9,4 @@
 
 <% end -%>
 ----------------------------------------
-<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :user => @user, :issue_url => @issue_url } %>

app/views/mailer/lost_password.html.erb

@@ -1,4 +1,6 @@
 <p><%= l(:mail_body_lost_password) %><br />
 <%= link_to @url, @url %></p>
 
+<p><%= l(:mail_body_lost_password_validity) %></p>
+
 <p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>

app/views/mailer/lost_password.text.erb

@@ -1,4 +1,6 @@
 <%= l(:mail_body_lost_password) %>
 <%= @url %>
 
+<%= l(:mail_body_lost_password_validity) %>
+
 <%= l(:field_login) %>: <%= @token.user.login %>

app/views/mailer/reminder.html.erb

@@ -2,8 +2,8 @@
 
 <ul>
 <% @issues.each do |issue| -%>
-  <li><%= link_to_issue(issue, :project => true, :only_path => false) %></li>
+  <li><%= link_to_issue(issue, :project => true, :only_path => false) %> (<%= due_date_distance_in_words(issue.due_date) %>)</li>
 <% end -%>
 </ul>
 
-<p><%= link_to l(:label_issue_view_all), @issues_url %></p>
+<p><%= link_to l(:label_issue_view_all), @issues_url %> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>)</p>

app/views/mailer/reminder.text.erb

@@ -1,7 +1,8 @@
 <%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
 
 <% @issues.each do |issue| -%>
-* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
+* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject} (#{due_date_distance_in_words(issue.due_date)})" %>
 <% end -%>
 
+<%= l(:label_issue_view_all)%> (<%= l(:label_x_open_issues_abbr, :count => @open_issues_count) %>)
 <%= @issues_url %>

app/views/mailer/security_notification.html.erb

@@ -7,7 +7,6 @@
 <%= content_tag :h1, @title -%>
 <% end %></p>
 
-<p><%= l(:field_user) %>: <strong><%= @originator.login %></strong><br/>
+<p><%= l(:field_user) %>: <strong><%= @sender.login %></strong><br/>
 <%= l(:field_remote_ip) %>: <strong><%= @remote_ip %></strong><br/>
-<%= l(:label_date) %>: <strong><%= format_time Time.now, true, @user %></strong></p>
-
+<%= l(:label_date) %>: <strong><%= format_time Time.now, true %></strong></p>

app/views/mailer/security_notification.text.erb

@@ -2,7 +2,6 @@
 
 <%= @url || @title %>
 
-<%= l(:field_user) %>: <%= @originator.login %>
+<%= l(:field_user) %>: <%= @sender.login %>
 <%= l(:field_remote_ip) %>: <%= @remote_ip %>
-<%= l(:label_date) %>: <%= format_time Time.now, true, @user %>
-
+<%= l(:label_date) %>: <%= format_time Time.now, true %>

app/views/mailer/settings_updated.html.erb

@@ -8,7 +8,7 @@
 
 <%= link_to @url, @url %>
 
-<p><%= l(:field_user) %>: <strong><%= User.current.login %></strong><br/>
-<%= l(:field_remote_ip) %>: <strong><%= User.current.remote_ip %></strong><br/>
+<p><%= l(:field_user) %>: <strong><%= @sender.login %></strong><br/>
+<%= l(:field_remote_ip) %>: <strong><%= @remote_ip %></strong><br/>
 <%= l(:label_date) %>: <strong><%= format_time Time.now, true %></strong></p>
 

app/views/mailer/settings_updated.text.erb

@@ -6,7 +6,7 @@
 
 <%= @url %>
 
-<%= l(:field_user) %>: <%= User.current.login %>
-<%= l(:field_remote_ip) %>: <%= User.current.remote_ip %>
+<%= l(:field_user) %>: <%= @sender.login %>
+<%= l(:field_remote_ip) %>: <%= @remote_ip %>
 <%= l(:label_date) %>: <%= format_time Time.now, true %>