jro_apps/redmine Commit - r10947:ff53a9cfe18d

Don't use Iconv with ruby1.9 (#12787)....

Jean-Philippe Lang -

r10947:ff53a9cfe18d

parent child

Context file:

r10947:ff53a9cfe18d

Collapse all files

lib/redmine/codeset_util.rb +14 -5

@@ -1,4 +1,6
1	require 'iconv'	1	if RUBY_VERSION < '1.9'
		2	require 'iconv'
		3	end
2		4
3	module Redmine	5	module Redmine
4	module CodesetUtil	6	module CodesetUtil
@@ -100,10 +102,17 module Redmine
100	end	102	end
101	encodings = Setting.repositories_encodings.split(',').collect(&:strip)	103	encodings = Setting.repositories_encodings.split(',').collect(&:strip)
102	encodings.each do \|encoding\|	104	encodings.each do \|encoding\|
103	begin	105	if str.respond_to?(:force_encoding)
104	return Iconv.conv('UTF-8', encoding, str)	106	str.force_encoding(encoding)
105	rescue Iconv::Failure	107	if str.valid_encoding?
106	# do nothing here and try the next encoding	108	return str.encode('UTF-8')
		109	end
		110	else
		111	begin
		112	return Iconv.conv('UTF-8', encoding, str)
		113	rescue Iconv::Failure
		114	# do nothing here and try the next encoding
		115	end
107	end	116	end
108	end	117	end
109	str = self.replace_invalid_utf8(str)	118	str = self.replace_invalid_utf8(str)

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

             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-            require 'iconv'
             require 'tcpdf'
             require 'fpdf/chinese'
             require 'fpdf/japanese'
             require 'fpdf/korean'
+            if RUBY_VERSION < '1.9'
+              require 'iconv'
+            end
             module Redmine
               module Export
                 module PDF
                     def SetTitle(txt)
                       txt = begin
-                        utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
+                        utf16txt = to_utf16(txt)
                         hextxt = "<FEFF"  # FEFF is BOM
                         hextxt << utf16txt.unpack("C*").map {|x| sprintf("%02X",x) }.join
                         hextxt << ">"
                       RDMPdfEncoding::rdm_from_utf8(txt, l(:general_pdf_encoding))
                     end
+                    # Encodes an UTF-8 string to UTF-16BE
+                    def to_utf16(str)
+                      if str.respond_to?(:encode)
+                        str.encode('UTF-16BE')
+                      else
+                        Iconv.conv('UTF-16BE', 'UTF-8', str)
+                      end
+                    end
                     def RDMCell(w ,h=0, txt='', border=0, ln=0, align='', fill=0, link='')
                       Cell(w, h, fix_text_encoding(txt), border, ln, align, fill, link)
                     end
                     def bookmark_title(txt)
                       txt = begin
-                        utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
+                        utf16txt = to_utf16(txt)
                         hextxt = "<FEFF"  # FEFF is BOM
                         hextxt << utf16txt.unpack("C*").map {|x| sprintf("%02X",x) }.join
                         hextxt << ">"

lib/redmine/scm/adapters/abstract_adapter.rb +4 0

             require 'cgi'
+            if RUBY_VERSION < '1.9'
+              require 'iconv'
+            end
             module Redmine
               module Scm
                 module Adapters

test/unit/lib/redmine/export/pdf_test.rb 0 -1

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../test_helper', __FILE__)
-            require 'iconv'
             class PdfTest < ActiveSupport::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles,

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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