summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-12-06 06:35:37 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-12-06 06:35:37 +0000
commit992212526973d4a1063c753a8b1d783342e14f20 (patch)
treed46a58186a84e116b69dac2b83671266208b0f52 /lib
parent6a824ee2ec63a68a0c723dac0e1b6d8b30714075 (diff)
downloadredmine-992212526973d4a1063c753a8b1d783342e14f20.tar.gz
redmine-992212526973d4a1063c753a8b1d783342e14f20.zip
pdf: use "family" parameter instead of l(:general_pdf_fontname) at SetFont method (#19017)
Contributed by Jun NAITOH. git-svn-id: http://svn.redmine.org/redmine/trunk@14950 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/export/pdf.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 9dd405a2a..6f386b5a7 100644
--- 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