Merged r14888 from trunk to 2.6-stable (#21328)

pdf: fix Vietnamese Italic is not shown.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14890 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index d8c949cfa14ae287eb0bfd3d8e693c46432d9c55..c3ec39a1cae96c99b82d72547b6b678de290ff47 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -56,7 +56,7 @@ module Redmine
           # 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'
+          style.delete!('I') if l(:general_pdf_fontname) == 'DejaVuSans' && current_language.to_s.casecmp("vi") != 0
           super(family, style, size, fontfile)
         end
         alias_method :set_font, :SetFont