Merged r14959 from trunk to 3.2-stable (#19017)

pdf: use "family" parameter instead of l(:general_pdf_fontname) at SetFont method.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14961 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 9dd405a2a074401ebb58369b352f504af219a185..a13a563858202c1dc4e51ddd52a3a72e34276eb0 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -52,9 +52,9 @@ module Redmine
 
         def SetFont(family, style='', size=0, fontfile='')
           # FreeSerif Bold Thai font has problem.
-          style.delete!('B') if l(:general_pdf_fontname) == 'freeserif'
+          style.delete!('B') if family.to_s.casecmp('freeserif') == 0
           # DejaVuSans Italic Arabic and Persian font has problem.
-          style.delete!('I') if l(:general_pdf_fontname) == 'DejaVuSans' && current_language.to_s.casecmp("vi") != 0
+          style.delete!('I') if family.to_s.casecmp('dejavusans') == 0 && current_language.to_s.casecmp("vi") != 0
           super(family, style, size, fontfile)
         end
         alias_method :set_font, :SetFont