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

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 987f2b9892c87bac09f435cff7061b803ba4a875..e4553e48a9828b142254d3825b5f52d057784485 100644 (file)
--- 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 ee7dbfac0558e3e6fbda1f11a5feab64f5e78c14..617af0053bb887cbaa2a4ee859f3c6c8a287318b 100644 (file)
--- 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,