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
This commit is contained in:
Toshi MARUYAMA
2015-02-08 10:39:00 +00:00
parent 18927905ba
commit bdaf2c27a1

View File

@@ -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