From 775e494ae37a3082e98cee8b7faaf1c92e83b506 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 18 Jan 2020 10:06:09 +0000 Subject: [PATCH] Merged r19435 from trunk to 4.1-stable (#32832). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19436 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/export/pdf.rb | 1 + test/functional/issues_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 987f2b989..e4553e48a 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -52,6 +52,7 @@ module Redmine end def SetFont(family, style='', size=0, fontfile='') + style = +style # FreeSerif Bold Thai font has problem. style.delete!('B') if family.to_s.casecmp('freeserif') == 0 # DejaVuSans Italic Arabic and Persian font has problem. diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index ee7dbfac0..617af0053 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -895,7 +895,7 @@ class IssuesControllerTest < Redmine::ControllerTest end def test_index_pdf - ["en", "zh", "zh-TW", "ja", "ko"].each do |lang| + ["en", "zh", "zh-TW", "ja", "ko", "ar"].each do |lang| with_settings :default_language => lang do get :index assert_response :success @@ -2388,7 +2388,7 @@ class IssuesControllerTest < Redmine::ControllerTest def test_export_to_pdf_with_utf8_u_fffd issue = Issue.generate!(:subject => "�") - ["en", "zh", "zh-TW", "ja", "ko"].each do |lang| + ["en", "zh", "zh-TW", "ja", "ko", "ar"].each do |lang| with_settings :default_language => lang do get :show, :params => { :id => issue.id,