jro_apps/redmine Commit - r5307:bb48d96d3037

scm: replace invalid utf-8 sequences instead of stripping in displaying repository contents on Ruby 1.8....

Toshi MARUYAMA -

r5307:bb48d96d3037

parent child

Context file:

r5307:bb48d96d3037

app/helpers/repositories_helper.rb +10 -4

                            :undef => :replace, :replace => '?').encode("UTF-8")
                    end
                  else
-                   # removes invalid UTF8 sequences
+                   ic = Iconv.new('UTF-8', 'UTF-8')
+                   txtar = ""
                    begin
-                     str = Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
-                   rescue Iconv::InvalidEncoding
-                     # "UTF-8//IGNORE" is not supported on some OS
+                     txtar += ic.iconv(str)
+                   rescue Iconv::IllegalSequence
+                     txtar += $!.success
+                     str = '?' + $!.failed[1,$!.failed.length]
+                     retry
+                   rescue
+                     txtar += $!.success
                    end
+                   str = txtar
                  end
                  str
                end

test/unit/helpers/repository_helper_test.rb +1 -3

                    s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding)
                    str = to_utf8(s1)
                    if str.respond_to?(:force_encoding)
-                     assert_equal "Texte encod? en ISO-8859-1.", str
                      assert str.valid_encoding?
                      assert_equal "UTF-8", str.encoding.to_s
-                   else
-                     assert_equal "Texte encod en ISO-8859-1.", str
                    end
+                   assert_equal "Texte encod? en ISO-8859-1.", str
                  end
                end
              end

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