Merged r6012 from trunk.

PDF: change Shift_JIS to SHIFT_JIS in lib/redmine/export/pdf.rb for Japanese ja.yml general_pdf_encoding.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6016 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 18bdd5a..3203c19 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -49,7 +49,7 @@ module Redmine
             AddUHCFont()
             @font_for_content = 'UHC'
             @font_for_footer  = 'UHC'
-          when 'CP932', 'SJIS', 'Shift_JIS'
+          when 'CP932', 'SJIS', 'SHIFT_JIS'
             extend(PDF_Japanese)
             AddSJISFont()
             @font_for_content = 'SJIS'