From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 4 Dec 2015 05:42:14 +0000 (+0000)
Subject: pdf: use "family" parameter instead of l(:general_pdf_fontname) at SetFont method... 
X-Git-Tag: 3.3.0~380
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=77f9155d55d74cd4c4b6e65edb915b6b893e8280;p=redmine.git

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@14907 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 8f94b68f2..9471ae015 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -51,9 +51,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 == 'freeserif'
           # 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 == 'DejaVuSans' && current_language.to_s.casecmp("vi") != 0
           super(family, style, size, fontfile)
         end
         alias_method :set_font, :SetFont