Merged r2262, r2341 and r2486 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2513 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c1acc5eb042a64896196000698d5ff7b5065c581..f82c013847109fabed7297d4065b3ceff8afe7ca 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -487,11 +487,11 @@ module ApplicationHelper
       full_messages = []
       object.errors.each do |attr, msg|
         next if msg.nil?
-        msg = msg.first if msg.is_a? Array
+        msg = [msg] unless msg.is_a?(Array)
         if attr == "base"
-          full_messages << l(msg)
+          full_messages << l(*msg)
         else
-          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
+          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
         end
       end
       # retrieve custom values error messages
@@ -499,8 +499,8 @@ module ApplicationHelper
         object.custom_values.each do |v|
           v.errors.each do |attr, msg|
             next if msg.nil?
-            msg = msg.first if msg.is_a? Array
-            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
+            msg = [msg] unless msg.is_a?(Array)
+            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
           end
         end
       end

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 0de3b0e3d4317485248a8cf65fcf188a41173327..2d0cc2cf5c420fb1f3644c8e8fb9e898d659e714 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -58,7 +58,7 @@
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
        
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7b94aa9d315ef09765d53c2a55a13f0fc545282f..0bd3b8a199ffe93e087aa271c50ad96d64a9a9f6 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -9,6 +9,9 @@ http://www.redmine.org/
 
 * Send an email to the user when an administrator activates a registered user
 * Strip keywords from received email body
+* Footer updated to 2009
+* Fixed: exporting an issue with attachments to PDF raises an error
+* Fixed: "too few arguments" error may occur on activerecord error translation
 
 
 == 2009-02-15 v0.8.1

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 5d75494edceafc73752d502c83f2b20f6854288b..932f1a812e66b5b603de0654a73e56aea7d55496 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -21,6 +21,8 @@ require 'rfpdf/chinese'
 module Redmine
   module Export
     module PDF
+      include ActionView::Helpers::NumberHelper
+      
       class IFPDF < FPDF
         include GLoc
         attr_accessor :footer_date

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d282d09e6df41acf3df6364900b90d8d753b164f..9228f7c024ea7f71178ec167c56fdb2edc2f6e55 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -253,7 +253,7 @@ class IssuesControllerTest < Test::Unit::TestCase
   end
 
   def test_show_export_to_pdf
-    get :show, :id => 1, :format => 'pdf'
+    get :show, :id => 3, :format => 'pdf'
     assert_response :success
     assert_equal 'application/pdf', @response.content_type
     assert @response.body.starts_with?('%PDF')