diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-06 12:24:18 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-12-06 12:24:18 +0000 |
| commit | 60dea89b2af19f36c80f72c3d33c9f1e8bf471f5 (patch) | |
| tree | dd623d1b5931e5caee49588f42f9202804d96570 /lib/redmine/export | |
| parent | f483ee832ff39c477952ff430a8a2b8379908897 (diff) | |
| download | redmine-60dea89b2af19f36c80f72c3d33c9f1e8bf471f5.tar.gz redmine-60dea89b2af19f36c80f72c3d33c9f1e8bf471f5.zip | |
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
Diffstat (limited to 'lib/redmine/export')
| -rw-r--r-- | lib/redmine/export/pdf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 9dd405a2a..a13a56385 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 |