2 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb
index 8fa8157d65..ee3b6d2b3f 100644
--- a/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/activesupport/lib/active_support/core_ext/string/access.rb
@@ -59,7 +59,7 @@ class String
   #   str.from(0).to(-1) #=> "hello"
   #   str.from(1).to(-2) #=> "ell"
   def to(position)
-    self[0..position]
+    self[0, position + 1]
   end
 
   # Returns the first character. If a limit is supplied, returns a substring
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index c62bb41416..a4cacaf789 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -41,8 +41,8 @@ class String
   def truncate(truncate_at, options = {})
     return dup unless length > truncate_at
 
-    options[:omission] ||= '...'
-    length_with_room_for_omission = truncate_at - options[:omission].length
+    omission = options[:omission] || '...'
+    length_with_room_for_omission = truncate_at - omission.length
     stop = \
       if options[:separator]
         rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
@@ -50,6 +50,6 @@ class String
         length_with_room_for_omission
       end
 
-    "#{self[0...stop]}#{options[:omission]}"
+    "#{self[0, stop]}#{omission}"
   end
 end