Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-15 18:41:58 +02:00
Code Issues Packages Projects Releases Activity

Merged r14959 from trunk to 3.2-stable (#19017)

Browse Source 
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
This commit is contained in:
Toshi MARUYAMA
2015-12-06 12:24:18 +00:00
parent f483ee832f
commit 60dea89b2a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/export/pdf.rb
View File

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