jro_apps/redmine Commit - r5231:2f2cdfd96a9c

PDF: replace converting error characters instead of returning UTF-8 in FPDF ANSI on Ruby 1.8 (#61)....

Toshi MARUYAMA -

r5231:2f2cdfd96a9c

parent child

Context file:

r5231:2f2cdfd96a9c

lib/redmine/export/pdf.rb +9 -3

                          txt.force_encoding('ASCII-8BIT')
                        else
                          @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-                         txt = begin
-                           @ic.iconv(txt)
+                         txtar = ""
+                         begin
+                           txtar += @ic.iconv(txt)
+                         rescue Iconv::IllegalSequence
+                           txtar += $!.success
+                           txt = '?' + $!.failed[1,$!.failed.length]
+                           retry
                          rescue
-                           txt
+                           txtar += $!.success
                          end
+                         txt = txtar
                        end
                        # 0x5c char handling
                        txt.gsub(/\\/, "\\\\\\\\")

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages