jro_apps/redmine Commit - r11210:59c704dcd2a2

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

Jean-Philippe Lang -

r11210:59c704dcd2a2

parent child

Context file:

r11210:59c704dcd2a2

lib/tasks/migrate_from_mantis.rake +7 -6

              desc 'Mantis migration script'
              require 'active_record'
-             require 'iconv'
+             require 'iconv' if RUBY_VERSION < '1.9'
              require 'pp'
              namespace :redmine do
                  end
                  def self.encoding(charset)
-                   @ic = Iconv.new('UTF-8', charset)
-                 rescue Iconv::InvalidEncoding
-                   return false
+                   @charset = charset
                  end
                  def self.establish_connection(params)
                  end
                  def self.encode(text)
+                   if RUBY_VERSION < '1.9'
+                     @ic ||= Iconv.new('UTF-8', @charset)
                    @ic.iconv text
-                 rescue
-                   text
+                   else
+                     text.to_s.force_encoding(@charset).encode('UTF-8')
+                   end
                  end
                end

lib/tasks/migrate_from_trac.rake +7 -8

              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'active_record'
-             require 'iconv'
+             require 'iconv' if RUBY_VERSION < '1.9'
              require 'pp'
              namespace :redmine do
                    end
                    def self.encoding(charset)
-                     @ic = Iconv.new('UTF-8', charset)
-                   rescue Iconv::InvalidEncoding
-                     puts "Invalid encoding!"
-                     return false
+                     @charset = charset
                    end
                    def self.set_trac_directory(path)
                      end
                    end
-                 private
                    def self.encode(text)
+                     if RUBY_VERSION < '1.9'
+                       @ic ||= Iconv.new('UTF-8', @charset)
                      @ic.iconv text
-                   rescue
-                     text
+                     else
+                       text.to_s.force_encoding(@charset).encode('UTF-8')
+                     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