PDF: more strict Redmine TCPDF class initialize() (#8312).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5723 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 7c2bf6636945f7bc38d56c3f44ea72c2975bf037..98f045679403b9416141f489d7bc0bbd546c98bc 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -34,12 +34,12 @@ module Redmine
         attr_accessor :footer_date
 
         def initialize(lang)
+          set_language_if_valid lang
+          pdf_encoding = l(:general_pdf_encoding).upcase
           if RUBY_VERSION < '1.9'
-            @ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+            @ic = Iconv.new(pdf_encoding, 'UTF-8')
           end
-          pdf_encoding = l(:general_pdf_encoding).upcase
           super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
-          set_language_if_valid lang
           case pdf_encoding
           when 'UTF-8'
             @font_for_content = 'FreeSans'