]> git.openstreetmap.org Git - rails.git/blobdiff - lib/validators.rb
Potlatch 2 localisation updates
[rails.git] / lib / validators.rb
index 095fb7af9ac3dc1bedea4f231963e1835f5dac2b..640a495649fc82a32b4db508a5a02a74323c89d2 100644 (file)
@@ -11,22 +11,10 @@ module ActiveRecord
       # is a valid UTF-8 format string.
       def validates_as_utf8(*attrs)
         validates_each(attrs) do |record, attr, value|
-          record.errors.add(attr, @@invalid_utf8_message) unless valid_utf8? value
+          record.errors.add(attr, @@invalid_utf8_message) unless UTF8.valid? value
         end
       end    
-      
-      ##
-      # Checks that a string is valid UTF-8 by trying to convert it to UTF-8
-      # using the iconv library, which is in the standard library.
-      def valid_utf8?(str)
-        return true if str.nil?
-        Iconv.conv("UTF-8", "UTF-8", str)
-        return true
 
-      rescue
-        return false
-      end  
-      
     end
   end
 end