Merged r13977 from trunk to 2.6-stable (#10681, #18586)

pdf: remove styles by fontname instated of Arabic/Persian/Thai locale.

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

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 7dbe85ccd5d2edc50452f86f3b1c08a4b890841f..d8c949cfa14ae287eb0bfd3d8e693c46432d9c55 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -53,8 +53,10 @@ module Redmine
         end
 
         def SetFont(family, style='', size=0, fontfile='')
-          style.delete!('B') if current_language.to_s.downcase == 'th' # FreeSerif Bold Thai font has problem.
-          style.delete!('I') if current_language.to_s.downcase =~ /^(fa|ar)$/ # DejaVuSans Italic Arabic and Persian font has problem.
+          # FreeSerif Bold Thai font has problem.
+          style.delete!('B') if l(:general_pdf_fontname) == 'freeserif'
+          # DejaVuSans Italic Arabic and Persian font has problem.
+          style.delete!('I') if l(:general_pdf_fontname) == 'DejaVuSans'
           super(family, style, size, fontfile)
         end
         alias_method :set_font, :SetFont